Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Fri, 5 Aug 2005 14:42:20 +0000 (07:42 -0700)]

Trivial merge