Merge 3.8-rc4 into char-misc-next (6596afe3) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+23 −17

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ S: Maintained
		F: drivers/platform/x86/acerhdf.c

		ACER WMI LAPTOP EXTRAS
		M: Joey Lee <jlee@novell.com>
		M: "Lee, Chun-Yi" <jlee@suse.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: drivers/platform/x86/acer-wmi.c
		@@ -648,7 +648,7 @@ F: arch/arm/

		ARM SUB-ARCHITECTURES
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: MAINTAINED
		S: Maintained
		F: arch/arm/mach-*/
		F: arch/arm/plat-*/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
		@@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k
		S: Supported
		F: drivers/net/wireless/ath/ath9k/

		WILOCITY WIL6210 WIRELESS DRIVER
		M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
		L: linux-wireless@vger.kernel.org
		L: wil6210@qca.qualcomm.com
		S: Supported
		W: http://wireless.kernel.org/en/users/Drivers/wil6210
		F: drivers/net/wireless/ath/wil6210/

		CARL9170 LINUX COMMUNITY WIRELESS DRIVER
		M: Christian Lamparter <chunkeey@googlemail.com>
		L: linux-wireless@vger.kernel.org
		@@ -1964,9 +1972,9 @@ S: Maintained
		F: drivers/usb/host/ohci-ep93xx.c

		CIRRUS LOGIC CS4270 SOUND DRIVER
		M: Timur Tabi <timur@freescale.com>
		M: Timur Tabi <timur@tabi.org>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		S: Odd Fixes
		F: sound/soc/codecs/cs4270*

		CLEANCACHE API
		@@ -3183,9 +3191,9 @@ F: include/uapi/video/
		F: include/uapi/linux/fb.h

		FREESCALE DIU FRAMEBUFFER DRIVER
		M: Timur Tabi <timur@freescale.com>
		M: Timur Tabi <timur@tabi.org>
		L: linux-fbdev@vger.kernel.org
		S: Supported
		S: Maintained
		F: drivers/video/fsl-diu-fb.*

		FREESCALE DMA DRIVER
		@@ -3220,9 +3228,8 @@ F: drivers/net/ethernet/freescale/fs_enet/
		F: include/linux/fs_enet_pd.h

		FREESCALE QUICC ENGINE LIBRARY
		M: Timur Tabi <timur@freescale.com>
		L: linuxppc-dev@lists.ozlabs.org
		S: Supported
		S: Orphan
		F: arch/powerpc/sysdev/qe_lib/
		F: arch/powerpc/include/asm/*qe.h

		@@ -3241,16 +3248,16 @@ S: Maintained
		F: drivers/net/ethernet/freescale/ucc_geth*

		FREESCALE QUICC ENGINE UCC UART DRIVER
		M: Timur Tabi <timur@freescale.com>
		M: Timur Tabi <timur@tabi.org>
		L: linuxppc-dev@lists.ozlabs.org
		S: Supported
		S: Maintained
		F: drivers/tty/serial/ucc_uart.c

		FREESCALE SOC SOUND DRIVERS
		M: Timur Tabi <timur@freescale.com>
		M: Timur Tabi <timur@tabi.org>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		L: linuxppc-dev@lists.ozlabs.org
		S: Supported
		S: Maintained
		F: sound/soc/fsl/fsl*
		F: sound/soc/fsl/mpc8610_hpcd.c

		@@ -5077,7 +5084,7 @@ S: Maintained
		F: drivers/media/radio/radio-mr800.c

		MSI LAPTOP SUPPORT
		M: "Lee, Chun-Yi" <jlee@novell.com>
		M: "Lee, Chun-Yi" <jlee@suse.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained
		F: drivers/platform/x86/msi-laptop.c
		@@ -5514,8 +5521,7 @@ M: Benoît Cousson <b-cousson@ti.com>
		M: Paul Walmsley <paul@pwsan.com>
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: arch/arm/mach-omap2/omap_hwmod.c
		F: arch/arm/plat-omap/include/plat/omap_hwmod.h
		F: arch/arm/mach-omap2/omap_hwmod.*

		OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
		M: Benoît Cousson <b-cousson@ti.com>
		@@ -7341,7 +7347,7 @@ S: Odd Fixes
		F: drivers/staging/speakup/

		STAGING - TI DSP BRIDGE DRIVERS
		M: Omar Ramirez Luna <omar.ramirez@ti.com>
		M: Omar Ramirez Luna <omar.ramirez@copitl.com>
		S: Odd Fixes
		F: drivers/staging/tidspbridge/

		@@ -8533,7 +8539,7 @@ F: Documentation/x86/
		F: arch/x86/

		X86 PLATFORM DRIVERS
		M: Matthew Garrett <mjg@redhat.com>
		M: Matthew Garrett <matthew.garrett@nebula.com>
		L: platform-driver-x86@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
		S: Maintained

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 8
		SUBLEVEL = 0
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = Terrified Chipmunk

		# DOCUMENTATION

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
		dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb

		targets += dtbs
		targets += $(dtb-y)
		endif

		# *.dtb used to be generated in the directory above. Clean out the

arch/arm/boot/dts/at91sam9260.dtsi

+18 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,22 @@
		};
		};

		ssc0 {
		pinctrl_ssc0_tx: ssc0_tx-0 {
		atmel,pins =
		<1 16 0x1 0x0 /* PB16 periph A */
		1 17 0x1 0x0 /* PB17 periph A */
		1 18 0x1 0x0>; /* PB18 periph A */
		};

		pinctrl_ssc0_rx: ssc0_rx-0 {
		atmel,pins =
		<1 19 0x1 0x0 /* PB19 periph A */
		1 20 0x1 0x0 /* PB20 periph A */
		1 21 0x1 0x0>; /* PB21 periph A */
		};
		};

		pioA: gpio@fffff400 {
		compatible = "atmel,at91rm9200-gpio";
		reg = <0xfffff400 0x200>;
		@@ -450,6 +466,8 @@
		compatible = "atmel,at91rm9200-ssc";
		reg = <0xfffbc000 0x4000>;
		interrupts = <14 4 5>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
		status = "disabled";
		};

arch/arm/boot/dts/at91sam9263.dtsi

+36 −0

Original line number	Diff line number	Diff line
		@@ -271,6 +271,38 @@
		};
		};

		ssc0 {
		pinctrl_ssc0_tx: ssc0_tx-0 {
		atmel,pins =
		<1 0 0x2 0x0 /* PB0 periph B */
		1 1 0x2 0x0 /* PB1 periph B */
		1 2 0x2 0x0>; /* PB2 periph B */
		};

		pinctrl_ssc0_rx: ssc0_rx-0 {
		atmel,pins =
		<1 3 0x2 0x0 /* PB3 periph B */
		1 4 0x2 0x0 /* PB4 periph B */
		1 5 0x2 0x0>; /* PB5 periph B */
		};
		};

		ssc1 {
		pinctrl_ssc1_tx: ssc1_tx-0 {
		atmel,pins =
		<1 6 0x1 0x0 /* PB6 periph A */
		1 7 0x1 0x0 /* PB7 periph A */
		1 8 0x1 0x0>; /* PB8 periph A */
		};

		pinctrl_ssc1_rx: ssc1_rx-0 {
		atmel,pins =
		<1 9 0x1 0x0 /* PB9 periph A */
		1 10 0x1 0x0 /* PB10 periph A */
		1 11 0x1 0x0>; /* PB11 periph A */
		};
		};

		pioA: gpio@fffff200 {
		compatible = "atmel,at91rm9200-gpio";
		reg = <0xfffff200 0x200>;
		@@ -368,6 +400,8 @@
		compatible = "atmel,at91rm9200-ssc";
		reg = <0xfff98000 0x4000>;
		interrupts = <16 4 5>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
		status = "disabled";
		};

		@@ -375,6 +409,8 @@
		compatible = "atmel,at91rm9200-ssc";
		reg = <0xfff9c000 0x4000>;
		interrupts = <17 4 5>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
		status = "disabled";
		};