David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c		2010-04-11 14:53:53 -07:00
..
Kconfig	wl1271: Changed wl1271_sdio to be selectable only on ARM	2010-03-10 17:44:43 -05:00
Makefile	wl1271: Initial SDIO implementation	2010-03-09 15:02:59 -05:00
wl12xx_80211.h	wl1271: fix endianess issues	2009-10-27 16:48:19 -04:00
wl1251.h	wl1251: fix ELP_CTRL register accesses when using SDIO	2010-03-15 15:32:03 -04:00
wl1251_acx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wl1251_acx.h	wl1251: implement wl1251_acx_tid_cfg()	2009-12-21 18:55:57 -05:00
wl1251_boot.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1251_boot.h	wl1251: remove wl1251_ops	2009-08-14 09:13:38 -04:00
wl1251_cmd.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wl1251_cmd.h	wl1251: use mac80211 provided channel parameters in scanning	2010-01-12 13:51:26 -05:00
wl1251_debugfs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wl1251_debugfs.h	wl1251: use wl1251 prefix everywhere	2009-07-10 14:57:50 -04:00
wl1251_event.c	wl1251: Increase the beacon loss timeout value and handle regain event	2009-11-18 17:09:22 -05:00
wl1251_event.h	wl1251: use wl1251 prefix everywhere	2009-07-10 14:57:50 -04:00
wl1251_init.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wl1251_init.h	wl1251: implement acx_ac_cfg to configure hardware queues	2009-12-21 18:55:55 -05:00
wl1251_io.c	wl1251: rename reg.h to wl1251_reg.h	2009-08-14 09:13:41 -04:00
wl1251_io.h	wl1251: fix ELP_CTRL register accesses when using SDIO	2010-03-15 15:32:03 -04:00
wl1251_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1251_ps.c	wl1251: fix ELP_CTRL register accesses when using SDIO	2010-03-15 15:32:03 -04:00
wl1251_ps.h	wl1251: Implement delayed entry into ELP mode	2009-11-18 17:09:20 -05:00
wl1251_reg.h	wl1251: add NVS in EEPROM support	2009-11-18 17:09:24 -05:00
wl1251_rx.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wl1251_rx.h	wl12xx: fix spelling	2009-07-24 15:05:26 -04:00
wl1251_sdio.c	wl1251: fix ELP_CTRL register accesses when using SDIO	2010-03-15 15:32:03 -04:00
wl1251_spi.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
wl1251_spi.h	wl1251: rename reg.h to wl1251_reg.h	2009-08-14 09:13:41 -04:00
wl1251_tx.c	wl1251: update tx_hdr when aliging skb in tx	2009-12-21 18:56:00 -05:00
wl1251_tx.h	wl1251: enable WMM	2009-12-21 18:56:02 -05:00
wl1271.h	wl1271: Changed platform_device to be dynamically allocated	2010-03-23 16:50:25 -04:00
wl1271_acx.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_acx.h	wl1271: Add sysfs file to control BT co-ex state	2010-03-23 16:50:21 -04:00
wl1271_boot.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_boot.h	wl1271: RefClk configuration	2009-10-27 16:48:04 -04:00
wl1271_cmd.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_cmd.h	wl1271: create qos nullfunc template	2010-03-23 16:50:22 -04:00
wl1271_conf.h	wl1271: Add proper WLAN-BT co-ex configuration, and enable co-ex.	2010-03-23 16:50:19 -04:00
wl1271_debugfs.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_debugfs.h	wl1271: add wl1271 driver files	2009-08-14 09:12:46 -04:00
wl1271_event.c	wl1271: get probe request template from mac80211	2010-03-23 16:50:22 -04:00
wl1271_event.h	wl1271: Fix event acknowledging functionality	2009-12-28 16:31:34 -05:00
wl1271_init.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_init.h	wl1271: add most of the normal initialization commands to PLT mode	2010-02-19 15:52:44 -05:00
wl1271_io.c	wl1271: Removed wl1271_spi.h and made some functions static	2010-03-09 15:02:58 -05:00
wl1271_io.h	wl1271: Changed platform_device to be dynamically allocated	2010-03-23 16:50:25 -04:00
wl1271_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_ps.c	wl1271: Removed wl1271_spi.h and made some functions static	2010-03-09 15:02:58 -05:00
wl1271_ps.h	wl1271: Fix PSM entry	2010-02-19 15:52:42 -05:00
wl1271_reg.h	wl1271: remove unused flags	2010-01-14 18:16:54 -05:00
wl1271_rx.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_rx.h	wl1271: fix endianess issues	2009-10-27 16:48:19 -04:00
wl1271_sdio.c	wl1271: Changed platform_device to be dynamically allocated	2010-03-23 16:50:25 -04:00
wl1271_spi.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_testmode.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
wl1271_testmode.h	wl1271: add testmode support	2010-02-19 15:52:47 -05:00
wl1271_tx.c	wl1271: Disable host TX rate control	2010-03-09 15:03:05 -05:00
wl1271_tx.h	wl1271: enable WMM	2010-03-23 16:50:21 -04:00