| commit | 6bb7aabf73401c9cfca26c71ccae1e3d6e1640d5 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 12 14:26:48 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 12 14:26:48 2013 -0400 |
| tree | 515bdf9875c34447c51ed7512749bbaa93641588 | |
| parent | 8c8d2017ba25c510ddf093419048460db1109bc4 [diff] | |
| parent | 795d855d56c6d172f50a974f603ba923ac93ee76 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211