John W. Linville 59ef43e681 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	include/net/nfc/nfc.h
	net/nfc/netlink.c
	net/wireless/nl80211.c

2012-04-18 14:27:48 -04:00

..

iwl-1000.c

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00

iwl-2000.c

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00

iwl-5000.c

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00

iwl-6000.c

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00

iwl-agn-calib.c

iwlwifi: Disabling calibrations variable

2012-04-16 14:36:44 -07:00

iwl-agn-calib.h

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-agn-devices.c

iwlwifi: move channel switch related functions

2012-04-12 14:18:37 -07:00

iwl-agn-hw.h

iwlwifi: move queue mapping out of transport

2012-04-09 16:37:22 -04:00

iwl-agn-lib.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-agn-rs.c

iwlwifi: calculate active legacy rates per station

2012-04-12 14:18:19 -07:00

iwl-agn-rs.h

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-agn-rx.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-agn-rxon.c

iwlwifi: expose static methods for MVM use

2012-04-16 14:45:10 -07:00

iwl-agn-sta.c

iwlwifi: move iwl_bcast_addr to iwl-agn-sta.c

2012-04-12 14:23:48 -07:00

iwl-agn-tt.c

iwlwifi: more status bit factoring

2012-03-08 13:59:55 -05:00

iwl-agn-tt.h

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-agn-tx.c

iwlwifi: move hw_params into priv

2012-04-12 15:06:09 -04:00

iwl-agn.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-agn.h

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-cfg.h

iwlwifi: make config const

2012-03-06 15:16:11 -05:00

iwl-commands.h

iwlwifi: more generic name for bluetooth command

2012-04-12 14:24:25 -07:00

iwl-config.h

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00

iwl-core.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-core.h

iwlwifi: move scan related declarations out of iwl-core.h

2012-04-12 14:24:11 -07:00

iwl-csr.h

iwlwifi: added HBUS_TARG_TEST_REG

2012-04-16 14:35:32 -07:00

iwl-debug.c

iwlwifi: remove per-device debug level

2012-03-06 15:16:10 -05:00

iwl-debug.h

iwlwifi: move status check functions out of shared

2012-03-07 13:51:51 -05:00

iwl-debugfs.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-dev.h

iwlwifi: Disabling calibrations variable

2012-04-16 14:36:44 -07:00

iwl-devtrace.c

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-devtrace.h

iwlwifi: make tracing use device as identifier

2012-03-07 13:51:52 -05:00

iwl-drv.c

iwlwifi: remove double verification of ucode sections

2012-04-16 14:36:20 -07:00

iwl-drv.h

iwlwifi: make config const

2012-03-06 15:16:11 -05:00

iwl-eeprom.c

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00

iwl-eeprom.h

iwlwifi: move eeprom into priv

2012-04-12 15:06:09 -04:00

iwl-fh.h

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-fw-file.h

iwlwifi: remove uCode alternatives mechanism

2012-04-16 14:34:44 -07:00

iwl-fw.h

iwlwifi: Add bool mvm_ucode to iwl_fw

2012-03-12 14:22:10 -04:00

iwl-io.c

iwlwifi: cleanup/fix memory barriers

2012-03-08 13:59:50 -05:00

iwl-io.h

iwlwifi: always check if got h/w access before write

2012-03-08 13:59:50 -05:00

iwl-led.c

iwlwifi: more status bit factoring

2012-03-08 13:59:55 -05:00

iwl-led.h

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-mac80211.c

iwlwifi: expose static methods for MVM use

2012-04-16 14:45:10 -07:00

iwl-notif-wait.c

iwlwifi: extend notification wait

2012-04-09 16:37:15 -04:00

iwl-notif-wait.h

iwlwifi: extend notification wait

2012-04-09 16:37:15 -04:00

iwl-op-mode.h

iwlwifi: complete STATUS_READY refactoring

2012-04-16 14:35:10 -07:00

iwl-pci.c

iwlwifi: remove uneeded include from iwl-pci.c

2012-04-16 14:36:33 -07:00

iwl-phy-db.c

iwlwifi: phy db channel to tx power channel group

2012-04-16 14:36:54 -07:00

iwl-phy-db.h

iwlwifi: phy db channel to tx power channel group

2012-04-16 14:36:54 -07:00

iwl-power.c

iwlwifi: remove no_sleep_autoadjust

2012-04-16 14:34:36 -07:00

iwl-power.h

iwlwifi: update Copyright

2012-01-24 14:08:36 -05:00

iwl-prph.h

iwlwifi: fix cmd_queue number merge

2012-03-09 13:20:50 -05:00

iwl-scan.c

iwlwifi: move hw_params into priv

2012-04-12 15:06:09 -04:00

iwl-shared.h

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-testmode.c

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

iwl-testmode.h

iwlwifi: add testmode command for rx forwarding

2012-03-08 13:59:52 -05:00

iwl-trans-pcie-int.h

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-trans-pcie-rx.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-trans-pcie-tx.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-trans-pcie.c

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-trans.h

iwlwifi: remove get_cmd_string

2012-04-16 14:49:56 -07:00

iwl-ucode.c

iwlwifi: expose static methods for MVM use

2012-04-16 14:45:10 -07:00

Kconfig

iwlwifi: change the default P2P support to "Yes"

2012-04-12 14:24:35 -07:00

Makefile

iwlwifi: dynamically determine lib_ops

2012-04-12 15:10:48 -04:00