]> 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, 22 Aug 2013 06:20:53 +0000 (16:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 06:20:53 +0000 (16:20 +1000)
commitdf930e97042113d105d1ef886649bf9b22bfabda
tree9c26ba4f9222b2536183ac48db67e3d0236aa841
parent17dc89512dc8be3b6dc3fb085102b7e625a63c1e
parent782371b2c2eddcc95db19318159d5e0631b9bfac
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
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