Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Fri, 13 Jan 2006 22:15:28 +0000 (09:15 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 13 Jan 2006 22:15:28 +0000 (09:15 +1100)

Trivial merge