Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Thu, 13 Mar 2008 04:26:33 +0000 (15:26 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 13 Mar 2008 04:26:33 +0000 (15:26 +1100)

Trivial merge