Merge branch 'linux-2.6' into for-2.6.24
authorPaul Mackerras <paulus@samba.org>
Thu, 13 Sep 2007 15:24:25 +0000 (01:24 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 13 Sep 2007 15:24:25 +0000 (01:24 +1000)

Trivial merge