Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / i82593.h
2009-11-17 John W. Linvilleznet: fix build failure from i82593.h relocation