Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 29 Dec 2008 21:32:35 +0000 (08:02 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 29 Dec 2008 21:32:35 +0000 (08:02 +1030)

Trivial merge