David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-08-26 16:37:08 -04:00

..

hostap_80211_rx.c

wireless: drivers: make use of WLAN_EID_VENDOR_SPECIFIC

2012-10-18 09:01:54 +02:00

hostap_80211_tx.c

drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:08 -04:00

hostap_80211.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

hostap_ap.c

wireless: single_open() leaks

2013-05-05 00:13:20 -04:00

hostap_ap.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

hostap_common.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

hostap_config.h

net: change to new flag variable

2011-03-17 14:05:35 +01:00

hostap_cs.c

drivers/net: use module_pcmcia_driver() in pcmcia drivers

2013-03-15 12:27:33 -07:00

hostap_download.c

hostap: Don't use create_proc_read_entry()

2013-04-29 15:41:56 -04:00

hostap_hw.c

wireless: single_open() leaks

2013-05-05 00:13:20 -04:00

hostap_info.c

drivers/net: use is_zero_ether_addr() instead of memcmp()

2012-09-07 15:03:38 -04:00

hostap_ioctl.c

Hostap: copying wrong data prism2_ioctl_giwaplist()

2013-08-09 14:01:21 -04:00

hostap_main.c

hostap: do not return positive number on failure path in prism2_open()

2013-08-05 14:52:45 -04:00

hostap_pci.c

net/wireless: use module_pci_driver

2012-04-16 14:38:50 -04:00

hostap_plx.c

net/wireless: use module_pci_driver

2012-04-16 14:38:50 -04:00

hostap_proc.c

wireless: single_open() leaks

2013-05-05 00:13:20 -04:00

hostap_wlan.h

hostap: Don't use create_proc_read_entry()

2013-04-29 15:41:56 -04:00

hostap.h

…

Kconfig

wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig

2009-10-30 16:50:35 -04:00

Makefile

…