]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 06:00:05 +0000 (16:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 06:00:05 +0000 (16:00 +1000)
commit67bc7cbd06c50c0435cf09d3a260ccc979dddf54
treeb6abfe3ac5fc3362a2e334973fd6d63e55feeb71
parent8e626d52dca323b6a89001d8f7b493569af51d73
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