]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:29:20 +0000 (21:29 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:29:20 +0000 (21:29 +0000)
Conflicts:
drivers/pci/host/pci-mvebu.c

1  2 
arch/arm/boot/dts/Makefile
drivers/pci/host/pci-mvebu.c

Simple merge
Simple merge