]> 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>
Mon, 11 Jun 2012 18:50:59 +0000 (14:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jun 2012 18:50:59 +0000 (14:50 -0400)
commit636985639dafbcd709a4b75f930adff7280bdb49
tree8df5f6b6ec01a0d53d5327bd63915902a18a4fbe
parent33177e5bf157a4187a0e2a6d8868e9fba77c9112
parente5a9645f162e8eae3847dec79112d17a5e437acc
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
drivers/net/wireless/iwlwifi/iwl-eeprom.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c