Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Mon, 11 Jul 2005 17:09:59 +0000 (10:09 -0700)]

Trivial merge