tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

Linus Torvalds 084c6c50 08edb33c

+3 -3
+2 -2
MAINTAINERS
··· 911 911 F: arch/arm/mach-footbridge/ 912 912 913 913 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 914 - M: Shawn Guo <shawn.guo@linaro.org> 914 + M: Shawn Guo <shawn.guo@freescale.com> 915 915 M: Sascha Hauer <kernel@pengutronix.de> 916 916 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 917 917 S: Maintained 918 - T: git git://git.linaro.org/people/shawnguo/linux-2.6.git 918 + T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git 919 919 F: arch/arm/mach-imx/ 920 920 F: arch/arm/boot/dts/imx* 921 921 F: arch/arm/configs/imx*_defconfig
+1 -1
arch/arm/boot/dts/sama5d36.dtsi
··· 8 8 */ 9 9 #include "sama5d3.dtsi" 10 10 #include "sama5d3_can.dtsi" 11 - #include "sama5d3_emac.dtsi" 12 11 #include "sama5d3_gmac.dtsi" 12 + #include "sama5d3_emac.dtsi" 13 13 #include "sama5d3_lcd.dtsi" 14 14 #include "sama5d3_mci2.dtsi" 15 15 #include "sama5d3_tcb1.dtsi"