David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
act2000	ISDN: ARRAY_SIZE changes	2009-07-25 20:23:05 +02:00
capi	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
divert	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
gigaset	gigaset: convert strcmp chain to table lookup	2009-10-29 01:37:18 -07:00
hardware	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
hisax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-09 09:51:42 -08:00
hysdn	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
i4l	Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation."	2009-11-15 22:23:47 -08:00
icn	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
isdnloop	drivers/isdn: correct use of ! and &	2008-03-04 16:35:16 -08:00
mISDN	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-06 00:55:55 -08:00
pcbit	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
sc	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
Kconfig	ISDN: Make isdnhdlc usable for other ISDN drivers	2009-07-25 20:15:21 +02:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00