Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa2c8f40 authored Feb 19, 2012 by Mark Brown

Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict

resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c

parents a3874196 b01543df

MAINTAINERS

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3318,6 +3318,12 @@ S: Maintained
	F: net/ieee802154/		F: net/ieee802154/
	F: drivers/ieee802154/		F: drivers/ieee802154/

			IIO SUBSYSTEM AND DRIVERS
			M: Jonathan Cameron <jic23@cam.ac.uk>
			L: linux-iio@vger.kernel.org
			S: Maintained
			F: drivers/staging/iio/

	IKANOS/ADI EAGLE ADSL USB DRIVER		IKANOS/ADI EAGLE ADSL USB DRIVER
	M: Matthieu Castet <castet.matthieu@free.fr>		M: Matthieu Castet <castet.matthieu@free.fr>
	M: Stanislaw Gruszka <stf_xl@wp.pl>		M: Stanislaw Gruszka <stf_xl@wp.pl>

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 3		PATCHLEVEL = 3
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc3		EXTRAVERSION = -rc4
	NAME = Saber-toothed Squirrel		NAME = Saber-toothed Squirrel

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/boot/dts/exynos4210.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@
	compatible = "arm,cortex-a9-gic";		compatible = "arm,cortex-a9-gic";
	#interrupt-cells = <3>;		#interrupt-cells = <3>;
	interrupt-controller;		interrupt-controller;
			cpu-offset = <0x8000>;
	reg = <0x10490000 0x1000>, <0x10480000 0x100>;		reg = <0x10490000 0x1000>, <0x10480000 0x100>;
	};		};

arch/arm/boot/dts/tegra-paz00.dts

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -46,11 +46,11 @@
	};		};

	serial@70006200 {		serial@70006200 {
	status = "disable";		clock-frequency = <216000000>;
	};		};

	serial@70006300 {		serial@70006300 {
	clock-frequency = <216000000>;		status = "disable";
	};		};

	serial@70006400 {		serial@70006400 {
	@@ -60,7 +60,7 @@
	sdhci@c8000000 {		sdhci@c8000000 {
	cd-gpios = <&gpio 173 0>; /* gpio PV5 */		cd-gpios = <&gpio 173 0>; /* gpio PV5 */
	wp-gpios = <&gpio 57 0>; /* gpio PH1 */		wp-gpios = <&gpio 57 0>; /* gpio PH1 */
	power-gpios = <&gpio 155 0>; /* gpio PT3 */		power-gpios = <&gpio 169 0>; /* gpio PV1 */
	};		};

	sdhci@c8000200 {		sdhci@c8000200 {

arch/arm/kernel/traps.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -266,6 +266,7 @@ void die(const char str, struct pt_regs regs, int err)
	{		{
	struct thread_info *thread = current_thread_info();		struct thread_info *thread = current_thread_info();
	int ret;		int ret;
			enum bug_trap_type bug_type = BUG_TRAP_TYPE_NONE;

	oops_enter();		oops_enter();

	@@ -273,7 +274,9 @@ void die(const char str, struct pt_regs regs, int err)
	console_verbose();		console_verbose();
	bust_spinlocks(1);		bust_spinlocks(1);
	if (!user_mode(regs))		if (!user_mode(regs))
	report_bug(regs->ARM_pc, regs);		bug_type = report_bug(regs->ARM_pc, regs);
			if (bug_type != BUG_TRAP_TYPE_NONE)
			str = "Oops - BUG";
	ret = __die(str, err, thread, regs);		ret = __die(str, err, thread, regs);

	if (regs && kexec_should_crash(thread->task))		if (regs && kexec_should_crash(thread->task))