Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6