Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

This commit is contained in:
Linus Torvalds 2005-11-22 16:51:33 -08:00
commit 4b4a27dff4