Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (084c6c50) · Commits · 戴 / test

Pull ARM SoC fixes from Olof Johansson: "Only two patches this time, one to fix ethernet probe order on at91 (better fix with proper device aliasing will be done for 3.15, this is stop-gap), and one update to MAINTAINERS due to Freescale moving their repo to kernel.org" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: at91: fix network interface ordering for sama5d36 MAINTAINERS: update IMX kernel git tree

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -911,11 +911,11 @@ F: arch/arm/include/asm/hardware/dec21285.h
		F: arch/arm/mach-footbridge/

		ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
		M: Shawn Guo <shawn.guo@linaro.org>
		M: Shawn Guo <shawn.guo@freescale.com>
		M: Sascha Hauer <kernel@pengutronix.de>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.linaro.org/people/shawnguo/linux-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
		F: arch/arm/mach-imx/
		F: arch/arm/boot/dts/imx*
		F: arch/arm/configs/imx*_defconfig

arch/arm/boot/dts/sama5d36.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@
		*/
		#include "sama5d3.dtsi"
		#include "sama5d3_can.dtsi"
		#include "sama5d3_emac.dtsi"
		#include "sama5d3_gmac.dtsi"
		#include "sama5d3_emac.dtsi"
		#include "sama5d3_lcd.dtsi"
		#include "sama5d3_mci2.dtsi"
		#include "sama5d3_tcb1.dtsi"

Admin message