projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e48686 b1abeda)
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)
commitb6038961dfeed49533e43fbedd86951a16cb4d2c
tree8df5f6b6ec01a0d53d5327bd63915902a18a4fbetree | snapshot (tar.gz zip)
parent2e48686835370dfe78697839ca293d250793809dcommit | diff
parentb1abedada3fd0aa100723aa9b60b7e31c17945cbcommit | diff
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next

Conflicts:
drivers/net/wireless/iwlwifi/iwl-eeprom.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c | diff2 | blob | history