Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 1 Dec 2009 07:16:22 +0000 (15:16 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 1 Dec 2009 07:16:22 +0000 (15:16 +0800)
1  2 
drivers/char/hw_random/core.c

Simple merge