Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 15 May 2012 07:21:26 +0000 (17:21 +1000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 15 May 2012 07:21:26 +0000 (17:21 +1000)
commitb29e2679d0da91c60d3ac190d9c3bd65ac2f68c5
tree518ec8f4bfd316e91bcc30f434edb78529557eba
parent8a63b1994c500d4825ee73dc71502deffe5b135b
parent4bb2d1009f671815870e8f78e826e4f9071392a7
Merge git://git./linux/kernel/git/torvalds/linux

Merge mainline to add prerequisite for ARM ux500 crypto support.
drivers/char/hw_random/omap-rng.c