]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 03:02:01 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 03:02:01 +0000 (13:02 +1000)
commitdb5d5072af149217f69bbfaad207fab9755e3b40
tree80bd9f89b2c83c14202fa733e9cbf10c373cf46d
parent9a8b5d926c802960869752e5e761d0bb4bd43c40
parent9f84951fc6f30eff20567632131c38725705753d
Merge remote-tracking branch 'crypto/master'

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