]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 01:17:51 +0000 (11:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 01:17:51 +0000 (11:17 +1000)
commit2bf6cdb55418cbb9e5f9d178fc8b175c9a23814b
tree5c47483fd9eca929c4114b2115db9a7c518aa451
parent8a051e74143a7c82d305041bb2089eb175090570
parent9f84951fc6f30eff20567632131c38725705753d
Merge remote-tracking branch 'crypto/master'

Conflicts:
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/char/hw_random/Kconfig