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
..
rtl8192c	rtlwifi: rtl8192c: Convert driver to use private ps_t struct	2012-04-23 15:35:32 -04:00
rtl8192ce	rtlwifi: rtl8192c: Convert driver to use private dm structs	2012-04-23 15:35:32 -04:00
rtl8192cu	rtlwifi: support for Belkin Surf N300 XR	2012-04-12 15:06:06 -04:00
rtl8192de	rtlwifi: rtl8192de: Convert driver to use private dm structs	2012-04-23 15:35:33 -04:00
rtl8192se	rtlwifi: rtl8192se: Convert driver to use private dm struct	2012-04-23 15:35:33 -04:00
base.c	rtlwifi: Fix oops on rate-control failure	2012-04-09 15:54:49 -04:00
base.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
cam.c	rtlwifi: Use is_zero_ether_addr, remove line continuation	2012-04-09 16:07:36 -04:00
cam.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
core.c	rtlwifi: Remove extra debugging message accidentally left in	2012-02-06 14:53:09 -05:00
core.h	rtlwifi: Convert to asynchronous firmware load	2012-01-30 15:48:50 -05:00
debug.c	rtlwifi: Move pr_fmt macros to a single location	2012-01-30 15:48:23 -05:00
debug.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
efuse.c	drivers/net: Remove boolean comparisons to true/false	2012-02-13 00:47:40 -05:00
efuse.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
Kconfig	rtlwifi: Fix breakage in debug functions when built as a module	2012-02-27 14:05:45 -05:00
Makefile	rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driver	2011-06-27 15:09:38 -04:00
pci.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
pci.h	rtlwifi: Convert to asynchronous firmware load	2012-01-30 15:48:50 -05:00
ps.c	drivers/net: Remove boolean comparisons to true/false	2012-02-13 00:47:40 -05:00
ps.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
rc.c	mac80211: remove channel type argument from rate_update	2012-04-10 14:54:08 -04:00
rc.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
regd.c	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
regd.h	rtlwifi: Update copyright dates	2012-01-24 14:08:37 -05:00
usb.c	rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine	2012-04-11 15:01:44 -04:00
usb.h	rtlwifi: Move pr_fmt macros to a single location	2012-01-30 15:48:23 -05:00
wifi.h	rtlwifi: Add dm structs to private structure	2012-04-23 15:35:32 -04:00