Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Aug 2012 18:15:47 +0000 (14:15 -0400)
commit6de3f7e911d27d6737c79b3f6b5069044ea408ec
tree186dcf1897be76a4155f5a22a7f242c29f328c5a
parent33dd7699cefd175c3a5d3d6077db9c8d8322c9a7
parent40503f7b48260a91ab65a4f8b00a2c6f004fa807
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/agn.h
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/pcie/trans.c