]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
arch/arm/mach-vt8500/include/mach/restart.h


Trivial merge