Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Thu, 20 Sep 2007 00:09:27 +0000 (10:09 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 20 Sep 2007 00:09:27 +0000 (10:09 +1000)

Trivial merge