Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Thu, 29 Sep 2005 15:55:43 +0000 (08:55 -0700)]

Trivial merge