]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:43:05 +0000 (12:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:43:05 +0000 (12:43 +1000)
commitcde64bd0f19ca7e9fcfb6b679be1c6529418c627
tree7fdc133f8d8c60f8efaf06c6241f3c91339c5420
parentdea6b167d962c47ce3dc24de4892729c96754560
parente3cd46e2ec1f5161310ccf668c0a21b6d2ca89b4
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/boot/dts/kirkwood.dtsi
drivers/pci/host/Kconfig
drivers/pci/host/pci-mvebu.c
arch/arm/boot/dts/Makefile
drivers/pci/host/Kconfig
drivers/pci/host/pci-mvebu.c