Merge branch 'linux-2.6' into merge
authorPaul Mackerras <paulus@samba.org>
Fri, 2 Nov 2007 03:03:14 +0000 (14:03 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 2 Nov 2007 03:03:14 +0000 (14:03 +1100)

Trivial merge