Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Thu, 31 Jan 2008 00:25:51 +0000 (11:25 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 31 Jan 2008 00:25:51 +0000 (11:25 +1100)

Trivial merge