| commit | 334300f247abc4f21124ff3ac192df5222ea79bf | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Oct 18 13:35:39 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Oct 18 13:35:39 2013 -0400 |
| tree | 6987fe992930e0f75f1064977047b48aee355cbf | |
| parent | 8245d02369859cc5c87b71722b327396d7a3ae75 [diff] | |
| parent | 095d81cee742fc31e1218077ca6ca8f0df07c613 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211