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
..
ath5k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
ath6kl	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
ath9k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
carl9170	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-04-12 13:49:28 -04:00
ath.h	ath9k: Add wiphy name to log messages.	2012-03-12 14:19:36 -04:00
debug.c	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00
hw.c	drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:08 -04:00
Kconfig	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
key.c	ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO	2011-12-19 14:35:31 -05:00
main.c	ath: Add and use pr_fmt, convert printks to pr_<level>	2012-04-10 14:52:13 -04:00
Makefile	atheros: force endian checks on atheros wireless drivers	2011-12-21 15:06:12 -05:00
reg.h
regd.c	ath: Add and use pr_fmt, convert printks to pr_<level>	2012-04-10 14:52:13 -04:00
regd.h
regd_common.h