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
..
act2000	isdn: Free irq_data namespace	2010-10-04 11:00:55 +02:00
capi	isdn: capi: Use pr_debug() instead of ifdefs.	2011-05-19 18:20:29 -04:00
divert	isdn: potential buffer overflows	2010-09-06 18:29:18 -07:00
gigaset	gigaset: call module_put before restart of if_open()	2011-06-17 15:27:32 -04:00
hardware	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-06-20 22:29:08 -07:00
hisax	net: remove interrupt.h inclusion from netdevice.h	2011-06-06 22:55:11 -07:00
hysdn	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 13:44:25 -07:00
i4l	isdn: i4l: isdn_tty: Fix unused-but-set variables.	2011-04-17 17:07:57 -07:00
icn	isdn: icn: Fix potentially wrong string handling	2011-02-01 14:17:51 -08:00
isdnloop	Fix common misspellings	2011-03-31 11:26:23 -03:00
mISDN	isdn: mISDN: socket: Fix set-but-unused variables.	2011-04-17 16:48:53 -07:00
pcbit	drivers/isdn: Use static const char * const where possible	2010-09-14 20:22:02 -07:00
sc	isdn: strcpy() => strlcpy()	2010-10-08 10:21:22 -07:00
Kconfig
Makefile