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

This commit is contained in:
Linus Torvalds 2005-11-29 14:23:38 -08:00
commit 2f12c74f0c