Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / isdn / isdnloop /
drwxr-xr-x   ..
-rw-r--r-- 144 Makefile
-rw-r--r-- 38755 isdnloop.c
-rw-r--r-- 4025 isdnloop.h