David S. Miller d4a66e752d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/benet/be_cmds.h include/linux/sysctl.h		2010-01-10 22:55:03 -08:00
..
act2000	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
capi	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
divert	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
gigaset	gigaset: don't enable any debugging output by default	2009-12-08 20:30:41 -08:00
hardware	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
hisax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2009-12-14 12:33:02 -08:00
hysdn	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
i4l	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
icn	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
isdnloop
mISDN	mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion	2009-12-18 20:30:11 -08:00
pcbit	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
sc	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
Kconfig	ISDN: Make isdnhdlc usable for other ISDN drivers	2009-07-25 20:15:21 +02:00
Makefile