Merge branch 'linus' into x86/cleanups
[pandora-kernel.git] / sound / oss / hal2.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2