Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Wed, 10 Sep 2008 01:36:13 +0000 (11:36 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 10 Sep 2008 01:36:13 +0000 (11:36 +1000)

Trivial merge