]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 05:20:03 +0000 (15:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 05:20:03 +0000 (15:20 +1000)
commit1bfae482904f0da59bd9c903f37c702ecd34e43b
tree26a401d8a79feccce7bb80a4bde6f086b1809075
parent49325e9e6c64a04762e98a0e7f76ba1af65eea51
parentfe3a47b1c7cd74a7e39cec1fa0d89bd3724f4f65
Merge remote-tracking branch 'msm/for-next'

Conflicts:
arch/arm/mach-msm/board-dt-8660.c
arch/arm/mach-msm/board-dt-8960.c
arch/arm/mach-msm/common.h
arch/arm/mach-vt8500/include/mach/restart.h