| commit | 5171f7a0b79dfbc61a6e12f20f6eef6d7dd5b2a8 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Feb 12 12:51:08 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Feb 12 12:51:08 2013 -0500 |
| tree | 50e48f8b65bc10fd7b8959735cb599884a161d1b | |
| parent | c88d0dc1cc0182358ce1ae6f457dace34539eb12 [diff] | |
| parent | 36eed56a8f7e1bd7fb5014ea0e702708e1702f30 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next Conflicts: drivers/net/wireless/iwlwifi/mvm/mac80211.c