| commit | 812fd645968118c35a3f4d0d18dd3f4d07221df0 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 12 15:39:05 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 12 15:39:05 2013 -0400 |
| tree | b68ee223f22a811e9743b193872052cd264fe2d0 | |
| parent | cb180840a0c6bff7c0787373c23cefdf20417a27 [diff] | |
| parent | 940d0ac9dbe3fb9d4806e96f006286c2e476deed [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Conflicts: drivers/net/wireless/iwlwifi/mvm/mac80211.c