]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cortex/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Oct 2012 02:34:25 +0000 (13:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Oct 2012 02:34:25 +0000 (13:34 +1100)
1  2 
arch/arm/kernel/process.c
arch/arm/mm/alignment.c

Simple merge
Simple merge