Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:20:55 +0000 (15:20 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:20:55 +0000 (15:20 +1100)

Trivial merge