Merge commit 'v3.3-rc6' into fbdev-next (d282e4d9) · Commits · e / devices / android_kernel_xiaomi_markw

MAINTAINERS

+6 −9

Original line number	Diff line number	Diff line
		@@ -269,7 +269,6 @@ S: Orphan
		F: drivers/platform/x86/wmi.c

		AD1889 ALSA SOUND DRIVER
		M: Kyle McMartin <kyle@mcmartin.ca>
		M: Thibaut Varene <T-Bone@parisc-linux.org>
		W: http://wiki.parisc-linux.org/AD1889
		L: linux-parisc@vger.kernel.org
		@@ -3056,7 +3055,6 @@ F: drivers/hwspinlock/hwspinlock_*
		F: include/linux/hwspinlock.h

		HARMONY SOUND DRIVER
		M: Kyle McMartin <kyle@mcmartin.ca>
		L: linux-parisc@vger.kernel.org
		S: Maintained
		F: sound/parisc/harmony.*
		@@ -3791,7 +3789,7 @@ F: Documentation/kdump/

		KERNEL AUTOMOUNTER v4 (AUTOFS4)
		M: Ian Kent <raven@themaw.net>
		L: autofs@linux.kernel.org
		L: autofs@vger.kernel.org
		S: Maintained
		F: fs/autofs4/

		@@ -4696,7 +4694,7 @@ NTFS FILESYSTEM
		M: Anton Altaparmakov <anton@tuxera.com>
		L: linux-ntfs-dev@lists.sourceforge.net
		W: http://www.tuxera.com/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
		S: Supported
		F: Documentation/filesystems/ntfs.txt
		F: fs/ntfs/
		@@ -5009,9 +5007,8 @@ F: Documentation/blockdev/paride.txt
		F: drivers/block/paride/

		PARISC ARCHITECTURE
		M: Kyle McMartin <kyle@mcmartin.ca>
		M: Helge Deller <deller@gmx.de>
		M: "James E.J. Bottomley" <jejb@parisc-linux.org>
		M: Helge Deller <deller@gmx.de>
		L: linux-parisc@vger.kernel.org
		W: http://www.parisc-linux.org/
		Q: http://patchwork.kernel.org/project/linux-parisc/list/
		@@ -5870,7 +5867,7 @@ S: Maintained
		F: drivers/mmc/host/sdhci-spear.c

		SECURITY SUBSYSTEM
		M: James Morris <jmorris@namei.org>
		M: James Morris <james.l.morris@oracle.com>
		L: linux-security-module@vger.kernel.org (suggested Cc:)
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
		W: http://security.wiki.kernel.org/
		@@ -5883,7 +5880,7 @@ S: Supported

		SELINUX SECURITY MODULE
		M: Stephen Smalley <sds@tycho.nsa.gov>
		M: James Morris <jmorris@namei.org>
		M: James Morris <james.l.morris@oracle.com>
		M: Eric Paris <eparis@parisplace.org>
		L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
		W: http://selinuxproject.org
		@@ -7283,7 +7280,7 @@ WATCHDOG DEVICE DRIVERS
		M: Wim Van Sebroeck <wim@iguana.be>
		L: linux-watchdog@vger.kernel.org
		W: http://www.linux-watchdog.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
		T: git git://www.linux-watchdog.org/linux-watchdog.git
		S: Maintained
		F: Documentation/watchdog/
		F: drivers/watchdog/

Makefile

+1 −1

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

		# DOCUMENTATION

arch/arm/common/it8152.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -320,13 +320,6 @@ err0:
		return -EBUSY;
		}

		/*
		* If we set up a device for bus mastering, we need to check the latency
		* timer as we don't have even crappy BIOSes to set it properly.
		* The implementation is from arch/i386/pci/i386.c
		*/
		unsigned int pcibios_max_latency = 255;

		/* ITE bridge requires setting latency timer to avoid early bus access
		termination by PCI bus master devices
		*/

arch/arm/common/pl330.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1502,12 +1502,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)
		struct pl330_thread *thrd = ch_id;
		struct pl330_dmac *pl330;
		unsigned long flags;
		int ret = 0, active = thrd->req_running;
		int ret = 0, active;

		if (!thrd \|\| thrd->free \|\| thrd->dmac->state == DYING)
		return -EINVAL;

		pl330 = thrd->dmac;
		active = thrd->req_running;

		spin_lock_irqsave(&pl330->lock, flags);

arch/arm/include/asm/assembler.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,11 @@
		disable_irq
		.endm

		.macro save_and_disable_irqs_notrace, oldcpsr
		mrs \oldcpsr, cpsr
		disable_irq_notrace
		.endm

		/*
		* Restore interrupt state previously stored in a register. We don't
		* guarantee that this will preserve the flags.