]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'galak/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 00:26:52 +0000 (11:26 +1100)
commit5c4fe18e0ecee0bf95331f6754399c0a252411a5
tree67c067c737e0b40c3e01a56203f5713a3957cb7f
parente98ad7d35fb1231511da225806bf896929c5b01c
parent12c7e8f62de546bff9f8ffa5a03e0ad292bcf17d
Merge remote-tracking branch 'galak/next'

Conflicts:
Documentation/devicetree/bindings/crypto/fsl-sec4.txt
arch/powerpc/platforms/512x/mpc512x_shared.c