Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 3 May 2010 03:28:58 +0000 (11:28 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 3 May 2010 03:28:58 +0000 (11:28 +0800)

Trivial merge