Merge branch 'linus' into x86/quirks
[linux-2.6] / drivers / isdn / divert / isdn_divert.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2