David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/pcmcia/ds.c Fix up merge failures with Linus's head and fix new compile failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-06 15:01:18 +00:00
..
act2000	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
capi	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
divert	[PATCH] severing skbuff.h -> mm.h	2006-12-04 02:00:34 -05:00
gigaset	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6	2006-12-01 16:41:58 -08:00
hardware	[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation	2006-12-04 20:12:02 -05:00
hisax	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-06 15:01:18 +00:00
hysdn	[PATCH] drivers/isdn/hysdn/hysdn_sched.c: sleep after taking spinlock fix	2006-11-03 12:27:59 -08:00
i4l	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
icn	[PATCH] ISDN: check for userspace copy faults	2006-10-17 08:18:49 -07:00
isdnloop	[PATCH] ISDN: check for userspace copy faults	2006-10-17 08:18:49 -07:00
pcbit	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
sc	[PATCH] ISDN: several minor fixes	2006-10-11 11:14:25 -07:00
Kconfig	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	[PATCH] isdn4linux: Siemens Gigaset drivers - Kconfigs and Makefiles	2006-03-26 08:57:05 -08:00