David S. Miller d122179a3c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/core/ethtool.c		2010-10-11 12:30:34 -07:00
..
act2000	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
capi	drivers: isdn: capi: use simple_strtol to convert numbers	2010-09-08 14:10:12 -07:00
divert	isdn: potential buffer overflows	2010-09-06 18:29:18 -07:00
gigaset	isdn/gigaset: improve bas_gigaset USB error reporting	2010-10-01 00:33:37 -07:00
hardware	eicon: make buffer larger	2010-10-06 23:30:39 -07:00
hisax	drivers/isdn: Adjust confusing if indentation	2010-08-16 21:06:30 -07:00
hysdn	drivers: isdn: remove custom strtoul()	2010-07-15 19:05:25 -07:00
i4l	i4l: kill big kernel lock	2010-09-15 19:29:55 -07:00
icn	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
isdnloop	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
mISDN	misdn: kill big kernel lock	2010-09-15 19:29:56 -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	isdn: fix a few Kconfig imperfections	2010-02-22 15:45:53 -08:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00