Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Fri, 21 Dec 2007 11:21:08 +0000 (22:21 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 21 Dec 2007 11:21:08 +0000 (22:21 +1100)

Trivial merge