| commit | ded652a67464b1fa66616954bc608ead9ec02fb6 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Feb 15 13:59:53 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Feb 15 13:59:53 2013 -0500 |
| tree | 7b4bf1ab3723ed6a906393a5c9f129381cf8e592 | |
| parent | b56e681b6210a635af4e4eb93ce81b4654851033 [diff] | |
| parent | 93c78c5debeb9c7101ecc73347d4730c26a98c05 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next