Merge branch 'upstream-fixes' into upstream
[safe/jmp/linux-2.6] / drivers / net / rionet.c
2005-09-14 Matt Porter[PATCH] Add rapidio net driver