]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit782371b2c2eddcc95db19318159d5e0631b9bfac
treecf7e7b74dd612147afafdfafd5eb8ffdf81f25db
parent2a7f9453d45a72aeb2c222d0167f76344407e8d0
parent8959f5ae29b6241befa953304cd0569226488c40
Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next

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