| commit | b6038961dfeed49533e43fbedd86951a16cb4d2c | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jun 11 14:50:59 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Jun 11 14:50:59 2012 -0400 |
| tree | 8df5f6b6ec01a0d53d5327bd63915902a18a4fbe | |
| parent | 2e48686835370dfe78697839ca293d250793809d [diff] | |
| parent | b1abedada3fd0aa100723aa9b60b7e31c17945cb [diff] |
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