Merge changes from linux-2.6 by hand
authorPaul Mackerras <paulus@samba.org>
Sat, 22 Oct 2005 06:51:34 +0000 (16:51 +1000)
committerPaul Mackerras <paulus@samba.org>
Sat, 22 Oct 2005 06:51:34 +0000 (16:51 +1000)

Trivial merge