]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:12:29 +0000 (15:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 05:12:29 +0000 (15:12 +1000)
Conflicts:
arch/arm/mach-vt8500/include/mach/restart.h


Trivial merge