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

This commit is contained in:
Linus Torvalds 2006-01-11 17:06:31 -08:00
commit 99535ac2d4