Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Mon, 19 Jan 2009 03:00:57 +0000 (14:00 +1100)
committerLachlan McIlroy <lachlan@sgi.com>
Mon, 19 Jan 2009 03:00:57 +0000 (14:00 +1100)

Trivial merge