Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorHerbert Xu <herbert@gondor.apana.org.au>
Sat, 7 Sep 2013 02:53:35 +0000 (12:53 +1000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sat, 7 Sep 2013 02:53:35 +0000 (12:53 +1000)
commiteeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6
treecc51c880459d41c0e8d7576405bef4c987bc7aa0
parentff6f83fc9d44db09997937c3475d525a6866fbb4
parentb48a97be8e6c2afdba2f3b61fd88c3c7743fbd73
Merge git://git./linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.
arch/arm/mach-omap2/devices.c
crypto/testmgr.c
drivers/char/hw_random/Kconfig
drivers/crypto/caam/caamhash.c