| commit | e9517fecf2ec6497fccb2c14ea0c014bda8b113a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Oct 10 13:38:50 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Oct 10 13:38:50 2013 -0400 |
| tree | b3b9ff55caab1849c6c7ea6698f6aa4962ce57fb | |
| parent | 274dede8c52036a1849ea970fab8d185fb0dce2b [diff] | |
| parent | 7578d57520f51093f590d68e16965e2714e69747 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next