]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:32:12 +0000 (11:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:32:12 +0000 (11:32 +1000)
commit995d8f979700e3d2521b6c31c7599ed23162be01
treec4943e2067c6297ba5ca8a77546c62a856f3d740
parentca797006e489e3a4888756116fc8f6fa404d0926
parent37284bd93103ae36b5ea274a985d688fb16f7a38
Merge remote-tracking branch 'sh/sh-latest'

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