Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Mon, 7 Nov 2005 03:42:09 +0000 (14:42 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 7 Nov 2005 03:42:09 +0000 (14:42 +1100)

Trivial merge