]> 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)
commit1949aae64de609a14cccc713d45a386f9d7dc41d
tree8df5f6b6ec01a0d53d5327bd63915902a18a4fbe
parent15868c9f863bf8a4b4920d1c426d7072dd7504dd
parent238c63f9bb985926046583a63a858b43e74ad0c4
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