]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:01:46 +0000 (15:01 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:01:46 +0000 (15:01 +0200)
commit3a7f8b4eeeb3c4ce1707a921416f9e2b10573c95
treebc849a57252198e6c7081a939c1a32e50a4ae86d
parent9b2e64d10c26128c796884787e02cfab3767b6db
parente3ea8a62445a94264305ec19e41b9121e0bb96c1
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-kirkwood/board-dt.c