Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 18:51:50 +0000 (14:51 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 May 2013 18:51:50 +0000 (14:51 -0400)
commit933faa43ab9c1545c53ea082a8e4e1d1859568aa
tree933a7e52081af4cb32699587cb79173537f6c638
parent531efffc3e3ff52d732c8fa6f32e084e9c447612
parent6abb9cb99f33b20c2f32f18a3ae9cc7543e46edb
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/iwlwifi/dvm/commands.h
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/pcie/tx.c