| commit | bd2a81307487eba486f200423330d2403d0b893b | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Nov 14 14:15:43 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Nov 14 14:15:43 2012 -0500 |
| tree | f15102f503619bcbd266acf650ade8b7b17f1c04 | |
| parent | 6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412 [diff] | |
| parent | 43c771a1963ab461a2f194e3c97fded1d5fe262f [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211