| commit | 89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Aug 22 11:35:22 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Aug 22 11:35:22 2013 -0400 |
| tree | 15e14665089f6603c07e4bfc8ba4011f97a23744 | |
| parent | 48c3e371350701444db51e8b35b5928d74dbacc3 [diff] | |
| parent | 75a423f493ffdf741acae27bf179cd560f7813d7 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211