David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
act2000	ISDN: ARRAY_SIZE changes	2009-07-25 20:23:05 +02:00
capi
divert
gigaset
hardware	mISDN: Fix wrong struct name in macro and clarifications	2009-07-27 08:20:55 -07:00
hisax	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
hysdn
i4l	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
icn
isdnloop
mISDN	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
pcbit
sc
Kconfig	ISDN: Make isdnhdlc usable for other ISDN drivers	2009-07-25 20:15:21 +02:00
Makefile