| commit | c77986c78aa941af8266272841567e78b72d54cc | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Feb 24 15:03:32 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Feb 24 15:03:32 2014 -0500 |
| tree | cb30e1bd7d5799bfce5a3837bcfddee059a81733 | |
| parent | 9e4b4269ecee426f1647425a24186dd1566db554 [diff] | |
| parent | 6658ab80fd4ef940fc2366ddb66690a15ea69c18 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next