Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Jan 2013 19:57:43 +0000 (14:57 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Jan 2013 19:57:43 +0000 (14:57 -0500)
commit48c6cc04c9ce5c38c76304377f6f7e5b1e98ca47
treec91096cfecc226413d4d702f52c71ef6152223df
parentba23d2068d85f6616ea5f92320c04e87d4b9e141
parentabae2386d55aff1d395cdb665f03684c227a6a69
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next
drivers/net/wireless/iwlwifi/dvm/mac80211.c