]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 02:06:41 +0000 (12:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Apr 2014 02:06:41 +0000 (12:06 +1000)
commitcf1a56f9bb6aaae4e04de8d1f409eaf6b14ca36a
treef6b0762436f4b6bfcd8f4bff69aefd245fc177c6
parent85176a8822f8354ae0a9771c1988075711ee363e
parent9f84951fc6f30eff20567632131c38725705753d
Merge remote-tracking branch 'crypto/master'

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