]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'sh/sh-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 01:00:29 +0000 (11:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 01:00:29 +0000 (11:00 +1000)
commit620943dc89cfe7d2279a4d0c402d3aeda35f07e8
tree55e5755cd94e4eb9e5f1e6b55ecd0b8630bd4cf9
parent8cd69b747c2d675436854dfa5a738852e9763138
parent37284bd93103ae36b5ea274a985d688fb16f7a38
Merge remote-tracking branch 'sh/sh-latest'

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