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 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		17 years ago
..
Kconfig	Linux-2.6.12-rc2	20 years ago
Makefile	Linux-2.6.12-rc2	20 years ago
irnet.h	irnet_ppp: BKL pushdown	17 years ago
irnet_irda.c	net/irda/irnet/irnet_irda.c needs unaligned.h	17 years ago
irnet_irda.h	proc: switch /proc/irda/irnet to seq_file interface	17 years ago
irnet_ppp.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	17 years ago
irnet_ppp.h	irda: Push BKL down into irda ioctl handlers	17 years ago