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
irnet_irda.h
irnet_ppp.c
irnet_ppp.h
irnet.h
Kconfig
Makefile	Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:13 -08:00