]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:49:20 +0000 (13:49 +0200)
committerThierry Reding <treding@nvidia.com>
Mon, 21 Oct 2013 11:49:20 +0000 (13:49 +0200)
commit67b3251dd337b574c091b0d8b6053a68741376cc
tree52e7fb451090d2cca054f309df36cd1bf217b8c0
parentc6f99c0e778f38196535d98311e0650be493ba63
parentd21ad3a6c39d56f96d9093247076c6fcddbb8f35
Merge remote-tracking branch 'mvebu/for-next'

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