Merge branch 'linux-2.6' into for-2.6.22
authorPaul Mackerras <paulus@samba.org>
Thu, 12 Apr 2007 17:50:03 +0000 (03:50 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 12 Apr 2007 17:50:03 +0000 (03:50 +1000)

Trivial merge