David S. Miller 17f7f4d9fc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/ipv4/fib_frontend.c		2010-12-26 22:37:05 -08:00
..
irnet_irda.c	net: return operator cleanup	2010-09-23 14:33:39 -07:00
irnet_irda.h	proc: switch /proc/irda/irnet to seq_file interface	2008-04-29 08:06:19 -07:00
irnet_ppp.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
irnet_ppp.h	irda/irnet: use noop_llseek	2010-09-15 19:29:55 -07:00
irnet.h	irda: Remove BKL instances from irnet	2010-10-11 02:11:34 +02:00
Kconfig	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:13 -08:00