David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08:00
..
avm	isdn: rename capi_ctr_reseted() to capi_ctr_down()	2009-06-08 00:45:50 -07:00
eicon	isdn: eicon: Return on error	2009-11-04 08:30:08 -08:00
mISDN	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
Kconfig
Makefile