]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:50:30 +0000 (09:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:50:30 +0000 (09:50 +1000)
commit3b7f09193314ef08a928e74dbe7805c93df3c80e
tree5305664eee68a2c544b32158373d898747e2b9e9
parent9c712a10f667498bd9c287be2a117638263d76e5
parent9e5ace6250ceeba39efff95b232690c4feb24a06
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c