Merge branch 'upstream'
[sfrench/cifs-2.6.git] / include / linux / apm_bios.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2