| commit | d339fc8980955faca38141a4483761241b62e7c4 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jan 04 16:05:14 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jan 04 16:05:14 2013 -0500 |
| tree | 12018549a124bd81b30e7ce383c86d27a823b91d | |
| parent | 9a6f7347f59f55433ec50578e8d42d305e0d53ae [diff] | |
| parent | 09b1426e7fcec510aba55a761da5004e47a11ce3 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211