Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[linux-2.6] / include / linux / telephony.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2