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
..
b43.h	b43: Load firmware from a work queue and not from the probe routine	2012-03-13 14:54:16 -04:00
bus.c
bus.h
debugfs.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
debugfs.h
dma.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-01-03 15:16:34 -05:00
dma.h
Kconfig	b43: add option to avoid duplicating device support with brcmsmac	2012-01-18 14:49:47 -05:00
leds.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
leds.h
lo.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
lo.h
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
main.h
Makefile
pcmcia.c	drivers/net: Add module.h to drivers who were implicitly using it	2011-10-31 19:31:07 -04:00
pcmcia.h
phy_a.c
phy_a.h
phy_common.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
phy_common.h
phy_g.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
phy_g.h
phy_ht.c
phy_ht.h
phy_lcn.c	b43: LCN-PHY: minor clean ups	2011-09-27 14:34:02 -04:00
phy_lcn.h	b43: LCN-PHY: finish sense setup	2011-09-19 16:10:14 -04:00
phy_lp.c	net: fix assignment of 0/1 to bool variables.	2011-12-19 22:27:29 -05:00
phy_lp.h
phy_n.c	b43: N-PHY: trivial: change save&rest order in RSSI polling	2012-01-24 14:06:06 -05:00
phy_n.h	b43: N-PHY: implement TX power control setup	2012-01-24 14:06:05 -05:00
pio.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-01-04 21:35:43 -05:00
pio.h
radio_2055.c
radio_2055.h
radio_2056.c	b43: N-PHY: finish 2.4GHz 0x2056 radio setup	2011-12-13 15:33:56 -05:00
radio_2056.h	b43: N-PHY: finish 2.4GHz 0x2056 radio setup	2011-12-13 15:33:56 -05:00
radio_2059.c
radio_2059.h
rfkill.c
rfkill.h
sdio.c	drivers/net: add missing __devexit_p() annotations	2012-04-21 15:28:47 -04:00
sdio.h
sysfs.c
sysfs.h
tables_lpphy.c
tables_lpphy.h
tables_nphy.c	b43: N-PHY: upload PAPD PGA gain delta table	2012-01-24 14:06:05 -05:00
tables_nphy.h	b43: N-PHY: upload PAPD PGA gain delta table	2012-01-24 14:06:05 -05:00
tables_phy_ht.c
tables_phy_ht.h
tables_phy_lcn.c	b43: LCN-PHY: minor clean ups	2011-09-27 14:34:02 -04:00
tables_phy_lcn.h
tables.c
tables.h
wa.c
wa.h
xmit.c	mac80211: remove hw.conf.channel usage where possible	2012-04-13 14:32:50 -04:00
xmit.h	b43: HT-PHY: report signal to mac80211	2011-11-07 13:19:12 -05:00