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

drivers/isdn/act2000/act2000.h

drivers/isdn/act2000/act2000_isa.c

drivers/isdn/act2000/act2000_isa.h

drivers/isdn/act2000/capi.c

drivers/isdn/act2000/capi.h

drivers/isdn/act2000/module.c

drivers/isdn/capi/capi.c

drivers/isdn/capi/capidrv.c

drivers/isdn/capi/capidrv.h

drivers/isdn/capi/capilib.c

drivers/isdn/capi/capiutil.c

drivers/isdn/capi/kcapi.c

drivers/isdn/capi/kcapi.h

drivers/isdn/capi/kcapi_proc.c

drivers/isdn/divert/divert_init.c

drivers/isdn/divert/divert_procfs.c

drivers/isdn/divert/isdn_divert.c

drivers/isdn/divert/isdn_divert.h

drivers/isdn/gigaset/asyncdata.c

drivers/isdn/gigaset/bas-gigaset.c