| commit | 199160bbc9271b9351c062a477699fea72b29e3a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Feb 06 14:34:31 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Feb 06 14:34:31 2014 -0500 |
| tree | 226786cda05a6bf0278a9f8d50e2a7445e9c59dd | |
| parent | 4cfe9a8d58292dc8e32a8093a95187d47507d394 [diff] | |
| parent | fab57a6cc227468ca9e6a4c7ff8d3b10727785ee [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211