Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 28 Nov 2008 04:23:52 +0000 (15:23 +1100)
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Fri, 28 Nov 2008 04:23:52 +0000 (15:23 +1100)

Trivial merge