Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core
[linux-2.6] / drivers / net / hplance.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2