Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 11 Jul 2005 23:32:40 +0000 (16:32 -0700)]

Trivial merge