| commit | 8d6fcbdb4e039544e3f60a909a0cd819f3f68ad9 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jun 22 13:56:34 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jun 22 13:56:34 2012 -0400 |
| tree | 12a4673f9fd75bf1b3485031bf40f80e1a59fad5 | |
| parent | 931cb03afed7b541392295f3afc4638da32f08a0 [diff] | |
| parent | 88a9e31c506c00c8b7a2f1611406d0e38dcb33b3 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211