Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Wed, 7 Feb 2007 03:05:13 +0000 (14:05 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 7 Feb 2007 03:05:13 +0000 (14:05 +1100)

Trivial merge