tree e8a37cac291bb64fa3d85ac27df45f56d493f2cb
parent c9df56b48e4ff003eaebd680ec7a45342dcd03ea
parent 8c23516fbb209ccf8f8c36268311c721faff29ee
author John W. Linville <linville@tuxdriver.com> 1316542315 -0400
committer John W. Linville <linville@tuxdriver.com> 1316542315 -0400

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c