android_kernel_xiaomi_sm8350/net/irda
David S. Miller 7c3ceb4a40 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c
2008-07-08 16:30:17 -07:00
..
ircomm tty: The big operations rework 2008-04-30 08:29:47 -07:00
irlan [IRDA]: Remove irlan_eth_send_gratuitous_arp() 2008-04-15 00:29:24 -07:00
irnet irda: Push BKL down into irda ioctl handlers 2008-05-25 23:43:11 -07:00
af_irda.c irda: Sock leak on error path in irda_create. 2008-06-03 15:18:36 -07:00
discovery.c irda: Fix a misalign access issue. (v2) 2008-05-13 23:25:57 -07: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 irda: use get_unaligned_* helpers 2008-05-02 16:21:52 -07: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 irda: Fix a misalign access issue. (v2) 2008-05-13 23:25:57 -07:00
irmod.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
irnetlink.c irda: Fix netlink error path return value 2008-07-08 03:07:43 -07: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
Makefile
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
wrapper.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00