Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[sfrench/cifs-2.6.git] / sound / oss / ulaw.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2