diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-22 09:13:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-22 09:13:13 -0700 |
| commit | 084c6c5013af3c62f1c344435214496f5ac999f2 (patch) | |
| tree | 363a3271b5110d55998b83c7e1fcb3fafc35db4b /arch | |
| parent | 08edb33c4e1b810011f21d7705811b7b9a0535f0 (diff) | |
| parent | f656d46bbb2d3ecdb71c998ccf657dccea8d19a9 (diff) | |
| download | linux-084c6c5013af3c62f1c344435214496f5ac999f2.tar.gz linux-084c6c5013af3c62f1c344435214496f5ac999f2.tar.bz2 linux-084c6c5013af3c62f1c344435214496f5ac999f2.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sama5d36.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d36.dtsi b/arch/arm/boot/dts/sama5d36.dtsi index 6c31c26e6cc0..db58cad6acd3 100644 --- a/arch/arm/boot/dts/sama5d36.dtsi +++ b/arch/arm/boot/dts/sama5d36.dtsi @@ -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" |