| commit | 08e22e193a0080d53dd0669c4f6422f602bb643c | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Apr 14 13:47:01 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Apr 14 13:47:01 2014 -0400 |
| tree | b85c76ba6466fce48bbce4500d49f142aa0bf263 | |
| parent | 321d03c86732e45f5f33ad0db5b68e2e1364acb9 [diff] | |
| parent | 764152ff66f4a8be1f9d7981e542ffdaa5bd7aff [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211