Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:24:14 +0000 (15:24 -0500)
commit841577c3d33b8a2bff66d1b506d8198b25900bde
tree444ca28c7b9ed796d3949f019ae97d2c8ed5bd28
parente9c653167710e5624c5576ee7d657c6b86878caf
parent63c361f5114d81db789f8f5671c76c228c35b021
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/iwlwifi/dvm/rs.c
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/mvm/rx.c
drivers/net/wireless/iwlwifi/mvm/scan.c