Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Mon, 30 Jun 2008 00:16:50 +0000 (10:16 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 30 Jun 2008 00:16:50 +0000 (10:16 +1000)

Trivial merge