You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
Kconfig	…
Makefile	Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions	14 years ago
irnet.h	irda: Remove BKL instances from irnet	15 years ago
irnet_irda.c	…
irnet_irda.h	…
irnet_ppp.c	BKL: remove extraneous #include <smp_lock.h>	14 years ago
irnet_ppp.h	…