Merge branch 'linux-2.6' into next
authorPaul Mackerras <paulus@samba.org>
Thu, 18 Dec 2008 00:06:12 +0000 (11:06 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 18 Dec 2008 00:06:12 +0000 (11:06 +1100)

Trivial merge