Merge by hand (conflicts in sr.c)
[linux-2.6] / sound / oss / au1550_ac97.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2