Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Tue, 26 Feb 2008 03:26:14 +0000 (14:26 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Tue, 26 Feb 2008 03:26:14 +0000 (14:26 +1100)

Trivial merge