Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Herbert Xu [Tue, 15 May 2012 07:21:26 +0000 (17:21 +1000)]
Merge mainline to add prerequisite for ARM ux500 crypto support.

1  2 
drivers/char/hw_random/omap-rng.c

Simple merge