Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 8 Nov 2005 18:23:00 +0000 (10:23 -0800)]

Trivial merge