You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
Kconfig	b43: add option to avoid duplicating device support with brcmsmac	13 years ago
Makefile	…
b43.h	b43: Load firmware from a work queue and not from the probe routine	13 years ago
bus.c	…
bus.h	…
debugfs.c	simple_open: automatically convert to simple_open()	13 years ago
debugfs.h	…
dma.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	13 years ago
dma.h	…
leds.c	net: fix assignment of 0/1 to bool variables.	13 years ago
leds.h	…
lo.c	net: fix assignment of 0/1 to bool variables.	13 years ago
lo.h	…
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
main.h	…
pcmcia.c	…
pcmcia.h	…
phy_a.c	…
phy_a.h	…
phy_common.c	net: fix assignment of 0/1 to bool variables.	13 years ago
phy_common.h	…
phy_g.c	net: fix assignment of 0/1 to bool variables.	13 years ago
phy_g.h	…
phy_ht.c	…
phy_ht.h	…
phy_lcn.c	…
phy_lcn.h	…
phy_lp.c	net: fix assignment of 0/1 to bool variables.	13 years ago
phy_lp.h	…
phy_n.c	b43: N-PHY: trivial: change save&rest order in RSSI polling	13 years ago
phy_n.h	b43: N-PHY: implement TX power control setup	13 years ago
pio.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
pio.h	…
radio_2055.c	…
radio_2055.h	…
radio_2056.c	b43: N-PHY: finish 2.4GHz 0x2056 radio setup	13 years ago
radio_2056.h	b43: N-PHY: finish 2.4GHz 0x2056 radio setup	13 years ago
radio_2059.c	…
radio_2059.h	…
rfkill.c	…
rfkill.h	…
sdio.c	drivers/net: add missing __devexit_p() annotations	13 years ago
sdio.h	…
sysfs.c	…
sysfs.h	…
tables.c	…
tables.h	…
tables_lpphy.c	…
tables_lpphy.h	…
tables_nphy.c	b43: N-PHY: upload PAPD PGA gain delta table	13 years ago
tables_nphy.h	b43: N-PHY: upload PAPD PGA gain delta table	13 years ago
tables_phy_ht.c	…
tables_phy_ht.h	…
tables_phy_lcn.c	…
tables_phy_lcn.h	…
wa.c	…
wa.h	…
xmit.c	mac80211: remove hw.conf.channel usage where possible	13 years ago
xmit.h	b43: HT-PHY: report signal to mac80211	13 years ago