David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
ipw2100.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-18 14:27:48 -04:00
ipw2100.h	Merge branch 'master' into for-davem	2012-04-12 14:41:59 -04:00
ipw2200.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -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	net: Fix typo in ipw2x00/libipw_rx.c	2012-02-06 14:50:38 -05: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