projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-eeprom.c

1  2 
drivers/net/wireless/iwlwifi/dvm/mac80211.c patch | diff1 | diff2 | blob | history

Domain: System / Uncategorized;