| commit | 8cab24f0b1daf23ba042464f0d4a4e51695bed74 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Apr 08 14:30:26 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Apr 08 14:30:26 2013 -0400 |
| tree | 7b65e5cf2c637fc62859a01aa4c96c5099f8d57c | |
| parent | 69a2bac8984c4e6dba78b330ed183fd580c65e99 [diff] | |
| parent | 62a40a15554d6924a58b3e9f8756e0d683dc9c0c [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211