Merge branch 'sched/for-linus' into tracing/for-linus
[linux-2.6] / drivers / pci / hotplug / cpqphp_nvram.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2