Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
authorPaul Mackerras <paulus@samba.org>
Tue, 26 Feb 2008 10:08:45 +0000 (21:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 26 Feb 2008 10:08:45 +0000 (21:08 +1100)

Trivial merge