Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Wed, 29 Mar 2006 02:24:50 +0000 (13:24 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 29 Mar 2006 02:24:50 +0000 (13:24 +1100)

Trivial merge