David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: MAINTAINERS drivers/net/wireless/iwlwifi/pcie/trans.c The iwlwifi conflict was resolved by keeping the code added in 'net' that turns off the buggy chip feature. The MAINTAINERS conflict was merely overlapping changes, one change updated all the wireless web site URLs and the other changed some GIT trees to be Johannes's instead of John's. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-12 21:59:18 -07:00
..
ipw2100.c	net/wireless: ipw2100: Fix WARN_ON occurring in wiphy_register called by ipw2100_pci_init_one	2012-06-08 13:43:57 -04:00
ipw2100.h	Merge branch 'master' into for-davem	2012-04-12 14:41:59 -04:00
ipw2200.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-06-12 14:25:04 -04:00
ipw2200.h	net/wireless: ipw2x00: remove unused definitions for regulatory domain	2012-03-12 14:19:37 -04:00
ipw.h	net/wireless: ipw2x00: add supported cipher suites to wiphy initialization	2012-04-12 15:10:48 -04:00
Kconfig
libipw_geo.c
libipw_module.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
libipw_rx.c	drivers/net: Convert compare_ether_addr to ether_addr_equal	2012-05-10 23:33:01 -04:00
libipw_tx.c	ipw2x00: comment typo fix encryptiong to encryption	2011-09-15 14:20:31 +02:00
libipw_wx.c	ipw2x00: remove reset_port functionality	2012-01-04 14:30:46 -05:00
libipw.h	net/wireless: ipw2x00: remove unused libipw_measurement_report struct	2012-04-11 16:24:00 -04:00
Makefile