]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:53:21 +0000 (11:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:53:21 +0000 (11:53 +1000)
commit419a9111c11b1dc780b837ba9aecaa28b1829fa8
treee22401d08ef755d754011ecb69ce14888148becf
parent0cfd4e7dfb8419c50209e376e39644b2591c1653
parent5208ed2ca16526cdbec25abe594a3cc3aea210f4
Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c
crypto/crypto_user.c
drivers/char/hw_random/Kconfig