Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 19 May 2008 05:09:05 +0000 (15:09 +1000)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 19 May 2008 05:09:05 +0000 (15:09 +1000)

Trivial merge