android_kernel_xiaomi_sm8350/net/irda
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
..
ircomm net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irlan net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irnet 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
af_irda.c [NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS. 2008-03-26 04:39:55 +09:00
discovery.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irda_device.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
iriap_event.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
iriap.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irias_object.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irlap_event.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irlap_frame.c [NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS. 2008-03-26 04:39:53 +09:00
irlap.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irlmp_event.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irlmp_frame.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irlmp.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irmod.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irnetlink.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irproc.c [IRDA]: Use proc_create() to setup ->proc_fops first 2008-02-29 10:34:45 -08:00
irqueue.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irsysctl.c [IrDA]: LMP discovery timer not started by default 2008-01-28 15:10:54 -08:00
irttp.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
Kconfig [S390] Kconfig: unwanted menus for s390. 2007-05-10 15:46:07 +02:00
Makefile [IrDA]: Netlink layer. 2007-07-10 22:16:43 -07:00
parameters.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
qos.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
timer.c more UTF-8 conversions 2007-10-19 23:22:11 +02:00
wrapper.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00