Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:29:09 +0000 (09:29 -0700)]

Trivial merge