David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
3945-debug.c
3945-mac.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-22 12:53:09 -04:00
3945-rs.c	cfg80211: add 802.11ad (60gHz band) support	2012-07-02 15:11:10 +02:00
3945.c	drivers:net: Remove dma_alloc_coherent OOM messages	2013-03-15 08:56:58 -04:00
3945.h	wireless: move sequence number arithmetic to ieee80211.h	2013-03-06 16:35:44 +01:00
4965-calib.c
4965-debug.c
4965-mac.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-03-20 15:24:57 -04:00
4965-rs.c	iwlegacy: 4965-rs: avoid null pointer dereference error	2013-03-27 11:07:05 -04:00
4965.c	net: iwlegacy: remove unused variable	2013-01-30 15:07:08 -05:00
4965.h	iwlegacy: Use standard #defines for PCIe Capability ASPM fields	2012-12-07 11:19:52 -07:00
commands.h	iwl4965: report A-MPDU status	2013-02-01 14:27:21 -05:00
common.c	net: wireless: iwlegacy: add CONFIG_PM_SLEEP to suspend/resume functions	2013-03-26 12:47:17 -04:00
common.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-03-20 15:24:57 -04:00
csr.h
debug.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
iwl-spectrum.h
Kconfig
Makefile
prph.h