]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 00:56:02 +0000 (10:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 27 May 2013 00:56:02 +0000 (10:56 +1000)
commit9248fd994e314401e5558102c83ccbf2ab9f8ca1
treea6701ef0e0e0220db135c4e74c03624a659ee2fc
parentd72df3304787ca48490117b1468ff8d0f441d05d
parent37284bd93103ae36b5ea274a985d688fb16f7a38
Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
arch/sh/kernel/cpu/sh2a/Makefile