Merge branch 'master' into for_paulus
[firefly-linux-kernel-4.4.55.git] / include / linux / isdn_divertif.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2