| commit | 2f2a8846d51ed7342603a8d7c196fcc9e2f8a319 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 19 14:50:44 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 19 14:50:44 2013 -0400 |
| tree | 16fc241ce3b45e787dad98fbf4e79ab790519c0a | |
| parent | fcb3701849957917a234a61b58ad70ed35c83eda [diff] | |
| parent | 3a5a423bb958ad22eeccca66c533e85bf69ba10e [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211