John W. Linville 6bd2bd27ba Merge tag 'mac80211-next-for-john-2014-09-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next ...

Johannes Berg <johannes@sipsolutions.net> says:

"This time, I have some rate minstrel improvements, support for a very
small feature from CCX that Steinar reverse-engineered, dynamic ACK
timeout support, a number of changes for TDLS, early support for radio
resource measurement and many fixes. Also, I'm changing a number of
places to clear key memory when it's freed and Intel claims copyright
for code they developed."

Conflicts:
	net/mac80211/iface.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>

2014-09-15 14:51:23 -04:00

..

3945-debug.c

drivers: net: Mark functions as static in 3945-debug.c

2013-12-18 15:23:12 -05:00

3945-mac.c

iwlegacy: merge reclaim check

2014-02-24 15:21:55 -05:00

3945-rs.c

mac80211: remove module handling from rate control ops

2014-02-04 21:48:26 +01:00

3945.c

PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

2014-08-12 12:15:14 -06:00

3945.h

iwlegacy: Remove extern from function prototypes

2013-09-24 18:05:24 -07:00

4965-calib.c

iwlegacy: remove enum iw_calib and related code

2012-02-29 14:14:55 -05:00

4965-debug.c

drivers: net: Mark functions as static in 4965-debug.c

2013-12-18 15:23:14 -05:00

4965-mac.c

Merge tag 'mac80211-next-for-john-2014-09-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2014-09-15 14:51:23 -04:00

4965-rs.c

mac80211: remove module handling from rate control ops

2014-02-04 21:48:26 +01:00

4965.c

wireless: delete non-required instances of include <linux/init.h>

2014-01-03 15:37:01 -05:00

4965.h

iwlegacy: Remove extern from function prototypes

2013-09-24 18:05:24 -07:00

commands.h

iwlegacy: properly enable power saving

2014-02-24 15:21:55 -05:00

common.c

iwlegacy: use correct structure type name in sizeof

2014-07-31 13:41:44 -04:00

common.h

mac80211: support more than one band in scan request

2014-06-25 09:10:42 +02:00

csr.h

iwlegacy: indentions and whitespaces

2011-11-15 14:45:59 +01:00

debug.c

drivers: net: Mark functions as static in debug.c

2013-12-18 15:23:16 -05:00

iwl-spectrum.h

iwlegacy: rename iwl to il

2011-11-15 11:16:58 +01:00

Kconfig

iwlegacy: Kconfig: Change Debug Option to be more clear

2012-02-29 14:14:55 -05:00

Makefile

iwlegacy: rename iwl-debug.c to debug.c

2011-11-15 14:24:36 +01:00

prph.h

iwlegacy: indentions and whitespaces

2011-11-15 14:45:59 +01:00