Merge branch 'linux-2.6' into for-linus
authorPaul Mackerras <paulus@samba.org>
Mon, 4 Dec 2006 04:59:07 +0000 (15:59 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 4 Dec 2006 04:59:07 +0000 (15:59 +1100)

Trivial merge