Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 23 May 2008 03:48:37 +0000 (13:48 +1000)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 23 May 2008 03:48:37 +0000 (13:48 +1000)

Trivial merge