Merge branch '20120221_isdn' of git://repo.or.cz/linux-2.6/trivial-mods