| commit | 855df36de365fb3b49eb06c352015e3d215b43fe | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 25 15:15:14 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 25 15:26:36 2014 -0400 |
| tree | 2a76f128eb457e1bacb585260b3e03f72b03cc1e | |
| parent | d6067f0e17eb1de7d9b1d792f67d17c6e894b770 [diff] | |
| parent | 97dc94f1d933c9df2c0b327066ea130c0e92083f [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next