| commit | 3b8de0749276abcb86bd7a6ca6691769a4ba7987 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jul 23 13:01:14 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jul 23 13:01:14 2014 -0400 |
| tree | d8fb187da3f8caca8c4557b76b5b4fe6f85348b5 | |
| parent | 0eeb315b20774296f977cecf0010794cd690c594 [diff] | |
| parent | fa8f136fe9a8fbdcb11a1db94f30146cae6d8777 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211