]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 02:51:37 +0000 (12:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 02:51:37 +0000 (12:51 +1000)
commit8673da05e12d18c5213202b5c14fccfc6f584d8f
treee1e5aa3b91db7010b9d4a7c541be5d63f4c44ef7
parente4c9619682dd70429402d7dd00b64ac78ca51116
parent9f84951fc6f30eff20567632131c38725705753d
Merge remote-tracking branch 'crypto/master'

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