kernel-fxtec-pro1x/net/irda/irnet
David S. Miller 8e8e43843b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c
2008-03-27 18:48:56 -07:00
..
irnet.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2008-03-27 18:48:56 -07:00
irnet_irda.c [IrDA]: Calling ppp_unregister_channel() from process context 2007-03-20 00:09:42 -07:00
irnet_irda.h [NET] IRDA: Fix whitespace errors. 2007-02-10 23:19:47 -08:00
irnet_ppp.c [IRDA] IRNET: Fix build when TCGETS2 is defined. 2007-11-01 02:26:38 -07:00
irnet_ppp.h
Kconfig
Makefile