]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 16:16:17 +0000 (18:16 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 16:16:17 +0000 (18:16 +0200)
* fixes:
  ARM: at91: sam9260: fix compilation issues
  ARM: mvebu: fix definitions of PCIe interfaces on Armada 38x
  ARM: mvebu: mvebu-soc-id: keep clock enabled if PCIe unit is enabled
  ARM: mvebu: mvebu-soc-id: add missing clk_put() call
  ARM: at91/dt: sam9260: correct external trigger value

1  2 
arch/arm/boot/dts/armada-380.dtsi
arch/arm/boot/dts/armada-385.dtsi
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-mvebu/mvebu-soc-id.c

Simple merge
Simple merge
Simple merge