]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 00:47:22 +0000 (10:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 00:47:22 +0000 (10:47 +1000)
commit8dda7f9113ccab747b50dbc0ada1a6a937597fbc
treeab3dfec3311ac92c44a6b3e6161aa7b5ef94bfa2
parent281333038981c829c78cbc65e0eece5663554264
parent37284bd93103ae36b5ea274a985d688fb16f7a38
Merge remote-tracking branch 'sh/sh-latest'

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