Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 00:06:04 +0000 (11:06 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 00:06:04 +0000 (11:06 +1100)

Trivial merge