Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Fri, 25 Nov 2005 11:12:01 +0000 (22:12 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 25 Nov 2005 11:12:01 +0000 (22:12 +1100)

Trivial merge