Merge branch 'linux-2.6' into for-2.6.22
authorPaul Mackerras <paulus@samba.org>
Mon, 30 Apr 2007 02:38:01 +0000 (12:38 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 30 Apr 2007 02:38:01 +0000 (12:38 +1000)

Trivial merge