]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite7ca12451d84da4c958e0f3267a1a69175939327
treeb68ba91a72b1b421d37914e4201fc672f12d86ae
parent296014425913805fa0c02cf7c7946f0fc05fdf69
parentb9aa28b2dd6288403bae822bd638f176e6de5793
Merge branch 'for-john' of git://git.kernel.org/pub/scm/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