| commit | b6a15802eee2dd8d401f5f89af31804f5a77f429 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Dec 17 13:32:20 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Dec 17 13:32:20 2013 -0500 |
| tree | 213e6db3ececae54a6c61ccfe256ac3513cc8a3b | |
| parent | bbf807bc0697e577c137a5fffb30fca7c6a45da1 [diff] | |
| parent | bd02cd2549cfcdfc57cb5ce57ffc3feb94f70575 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211