]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:57:55 +0000 (14:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:57:55 +0000 (14:57 +1000)
commitd9ab15e01361c6647e0dd2a7d98f25275411a600
treec833c226cf082f37bd43eb5c3a8b61a8a07a7498
parentf2cd7fd2ad94270bdec777bfa112c14d1f7ba660
parentfe3a47b1c7cd74a7e39cec1fa0d89bd3724f4f65
Merge remote-tracking branch 'msm/for-next'

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