Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

This commit is contained in:
Linus Torvalds 2005-06-01 13:20:35 -07:00
commit f9a2223925
7 changed files with 92 additions and 32 deletions