]> 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)
commite72359f81ae5bba0b1f73f66fa8b27381253cb6d
treeb68ba91a72b1b421d37914e4201fc672f12d86ae
parentddceddc004e481c3ed51a39572c708bb32c3fbe1
parent17fef30484c88e4deced28375916c48117a1c54a
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