David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c

2011-06-20 22:29:08 -07:00

..

avm

pcmcia: Convert pcmcia_device_id declarations to const

2011-05-06 07:46:22 +02:00

eicon

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-05-26 13:19:00 -07:00

mISDN

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

2011-06-20 22:29:08 -07: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