Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 19:38:49 +0000 (14:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 19:38:49 +0000 (14:38 -0500)
commit1e60896fe07307baa5f3ca1a220dfa9792657352
treeb68ba91a72b1b421d37914e4201fc672f12d86ae
parentad66786718989c20c91e855baa40371e01daf0a1
parenteea54c8ec971d4759c541dba351477dafc39ce54
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/main.c
drivers/net/wireless/iwlwifi/pcie/rx.c
drivers/net/wireless/iwlwifi/pcie/trans.c