Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Thu, 18 Aug 2005 21:57:53 +0000 (14:57 -0700)]

Trivial merge