| commit | fae172136c0cfc80cb4b13620c861688e671650a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Mar 25 14:50:17 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Mar 25 14:50:17 2013 -0400 |
| tree | 3dc683dcd8beb5e61361fadd74736742fd35c70b | |
| parent | 36ef0b473fbf43d5db23eea4616cc1d18cec245f [diff] | |
| parent | 370bd005937c0e00f9104a602f9fe1dd6b21b54b [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211