]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 01:06:07 +0000 (11:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 01:06:07 +0000 (11:06 +1000)
commit662b6a118d86e20b43c7429f5628a1f0f9108943
tree25908db179f580c2d552fbeb009ace9da99eea8b
parentbbf24c1108405e060993cd496ad4c3f74dfe3d7b
parentf6869e7fe657bd977e72954cd78c5871a6a4f71d
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/exceptions-64s.S