| commit | 73c8daa083973a4e16e39c3a52abb64bd3592de8 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Mar 06 13:47:16 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Mar 06 13:47:16 2014 -0500 |
| tree | 6054e61ede5badf364b0724ff18b394b06f915c7 | |
| parent | 9b8ba9f518829f7b7776e3b1f8c9f83c9696cf28 [diff] | |
| parent | 864a6040f395464003af8dd0d8ca86fed19866d4 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211