Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Mon, 6 Feb 2006 23:43:36 +0000 (10:43 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 6 Feb 2006 23:43:36 +0000 (10:43 +1100)

Trivial merge