Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / cxgb3i / cxgb3i_init.c