Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
[pandora-kernel.git] / drivers / char / mwave / smapi.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2