]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:49:08 +0000 (11:49 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:49:08 +0000 (11:49 +0200)
commit2a56ea84ffc60f5261257cd8c9a5816981dba401
treeff14dd3d5b8082c52120384f1847af3d2f03dc7a
parent2ea6d86a4d22fe80ec7e618635bd353918694de6
parente3ea8a62445a94264305ec19e41b9121e0bb96c1
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/board-dt.c
drivers/pci/host/pci-mvebu.c