Merge branch 'imx/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc (abf45ce8) · Commits · 戴 / test

MAINTAINERS

+9 −6

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
		@@ -3047,7 +3046,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.*
		@@ -3318,6 +3316,12 @@ S: Maintained
		F: net/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
		M: Matthieu Castet <castet.matthieu@free.fr>
		M: Stanislaw Gruszka <stf_xl@wp.pl>
		@@ -4994,9 +4998,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/
		@@ -5855,7 +5858,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/
		@@ -5868,7 +5871,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

Makefile

+1 −1

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

		# DOCUMENTATION

arch/arm/boot/dts/exynos4210.dtsi

+1 −0

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

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

+3 −3

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

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

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

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

		sdhci@c8000200 {

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
		*/

Admin message