| commit | f3e979a52c554f45e4ca6f01ca6933acef34b872 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Aug 28 13:51:40 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Aug 28 13:51:40 2013 -0400 |
| tree | 53aa9e61aa7fd0c225528fba4144b2d15f709ad9 | |
| parent | cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc [diff] | |
| parent | a98655387762394371b88cdfb8215884757978ab [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next