| commit | 4db89e149cde12f9390bfe90807cf4c5de74fcde | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Oct 14 13:22:59 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Oct 14 13:22:59 2013 -0400 |
| tree | 0c43ca509fa55ffcad187a8f52f59d64f1d941a0 | |
| parent | 4978705d26149a629b9f50ff221caed6f1ae3048 [diff] | |
| parent | d86aa4f8ca58898ec6a94c0635da20b948171ed7 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211