]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65f789a fe3a47b)
Merge remote-tracking branch 'msm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 05:12:50 +0000 (15:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 05:12:50 +0000 (15:12 +1000)
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


Trivial merge
Linux kernel for KaRo TX COM modules