David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -08:00

..

avm

pcmcia: rework the irq_req_t typedef

2009-11-28 18:03:14 +01:00

eicon

isdn: eicon: Return on error

2009-11-04 08:30:08 -08:00

mISDN

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-11-17 00:05:02 -08:00

Kconfig

Use menuconfig objects: ISDN: CONFIG_ISDN_CAPI

2007-07-17 10:23:05 -07:00

Makefile

Add mISDN driver

2008-07-27 01:46:33 +02:00