Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Mon, 10 Dec 2007 04:41:22 +0000 (15:41 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 10 Dec 2007 04:41:22 +0000 (15:41 +1100)

Trivial merge