]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:49:31 +0000 (19:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:49:31 +0000 (19:49 +1000)
commit96be9b1630d89f085aa2f814017ab828822da2c5
treebe70b2f35632ab361685cc2099270816a9743781
parentb1638718acf1d1547123437064670caf0c87a51c
parentfe3a47b1c7cd74a7e39cec1fa0d89bd3724f4f65
Merge remote-tracking branch 'msm/for-next'

Conflicts:
arch/arm/mach-vt8500/include/mach/restart.h