| commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Mar 20 11:53:20 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Mar 20 11:53:20 2014 -0400 |
| tree | 6cd273487574edd2da40ce14b1981e14a5171caa | |
| parent | 474a41e94dfc85167e1761bfbb8bf180f90633b2 [diff] | |
| parent | 73fb08e24ae840bc518facc2c605dd6bb3751fec [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next