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

2008-07-18 02:39:39 -07:00

..

irnet_irda.c

net/irda/irnet/irnet_irda.c needs unaligned.h

2008-05-14 19:11:15 -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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

irnet_ppp.h

irda: Push BKL down into irda ioctl handlers

2008-05-25 23:43:11 -07:00

irnet.h

irnet_ppp: BKL pushdown

2008-06-20 14:05:58 -06:00

Kconfig

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00