]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 13:11:51 +0000 (15:11 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 13:11:51 +0000 (15:11 +0200)
commitc303c84e7d402ee13eff070146a9f7a28f17a820
treec0e5076ab0ad6471a3dac5b856f5d6e11ed4c0ec
parent501d812e6452a5f58b31db0a25525b1507adabc1
parent969ae2ac40288b50a0ff4d84e8bddc2d8cc9d08a
Merge branch 'next/boards' into for-next

Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/board-bockw.c