Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)

Trivial merge