Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Sat, 12 Nov 2005 20:23:25 +0000 (12:23 -0800)]

Trivial merge