Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Mon, 14 Apr 2008 11:11:02 +0000 (21:11 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 14 Apr 2008 11:11:02 +0000 (21:11 +1000)

Trivial merge