Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Wed, 13 Sep 2006 21:07:18 +0000 (07:07 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 13 Sep 2006 21:07:18 +0000 (07:07 +1000)

Trivial merge