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, 18 Feb 2008 02:51:42 +0000 (13:51 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 18 Feb 2008 02:51:42 +0000 (13:51 +1100)

Trivial merge