Merge branch 'linux-2.6' into next
authorPaul Mackerras <paulus@samba.org>
Tue, 11 Nov 2008 21:43:22 +0000 (08:43 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 11 Nov 2008 21:43:22 +0000 (08:43 +1100)

Trivial merge