linux/drivers/net/irda
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
..
act200l-sir.c
actisys-sir.c Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
ali-ircc.c net drivers: fix platform driver hotplug/coldplug 2008-04-25 02:08:54 -04:00
ali-ircc.h irda: Remove useless pm_dev references 2008-07-08 03:08:16 -07:00
au1k_ir.c drivers/net/irda/au1k_ir: fix obvious irq handler bugs 2007-10-29 05:42:18 -04:00
au1000_ircc.h irda: Remove useless pm_dev references 2008-07-08 03:08:16 -07:00
donauboe.c irda: remove CVS keywords 2008-06-11 21:00:41 -07:00
donauboe.h
ep7211-sir.c
esi-sir.c
girbil-sir.c Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
irda-usb.c irda-usb: treat firmware data as const 2008-07-10 14:26:25 +01:00
irda-usb.h irda-usb endianness annotations and fixes 2008-05-21 16:55:59 -07:00
irtty-sir.c tty: The big operations rework 2008-04-30 08:29:47 -07:00
irtty-sir.h
Kconfig irda: net/irda build fix: mcs7780 2008-06-09 15:47:38 -07:00
kingsun-sir.c [NET]: Nuke SET_MODULE_OWNER macro. 2007-10-10 16:51:13 -07:00
ks959-sir.c [NET]: Nuke SET_MODULE_OWNER macro. 2007-10-10 16:51:13 -07:00
ksdazzle-sir.c [IRDA]: Oops fix for ksdazzle 2007-10-10 16:54:50 -07:00
litelink-sir.c
ma600-sir.c
Makefile [IrDA]: Irport removal - part 1 2008-01-28 15:08:10 -08:00
mcp2120-sir.c
mcs7780.c net: use get/put_unaligned_* helpers 2008-04-29 08:06:27 -07:00
mcs7780.h
nsc-ircc.c irda: New device ID for nsc-ircc 2008-07-08 03:07:16 -07:00
nsc-ircc.h Spelling fixes: lenght->length 2008-02-03 15:42:53 +02:00
old_belkin-sir.c
pxaficp_ir.c [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting 2008-07-09 20:56:29 +01:00
sa1100_ir.c net drivers: fix platform driver hotplug/coldplug 2008-04-25 02:08:54 -04:00
sir_dev.c drivers/net/irda: endianness, NULL noise 2007-10-10 16:52:02 -07:00
sir_dongle.c
sir-dev.h
smsc-ircc2.c irda: remove CVS keywords 2008-06-11 21:00:41 -07:00
smsc-ircc2.h irda: remove CVS keywords 2008-06-11 21:00:41 -07:00
smsc-sio.h
stir4200.c net: use get/put_unaligned_* helpers 2008-04-29 08:06:27 -07:00
tekram-sir.c Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
toim3232-sir.c
via-ircc.c irda: via-ircc proper dma freeing 2008-07-08 03:06:46 -07:00
via-ircc.h irda: Remove useless pm_dev references 2008-07-08 03:08:16 -07:00
vlsi_ir.c netdev: use non-racy method for proc entries creation 2008-04-29 08:06:22 -07:00
vlsi_ir.h drivers/net/irda: endianness, NULL noise 2007-10-10 16:52:02 -07:00
w83977af_ir.c [NET]: Nuke SET_MODULE_OWNER macro. 2007-10-10 16:51:13 -07:00
w83977af_ir.h Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
w83977af.h