| commit | b476d3f143e8b213273834e92615370ca65ff126 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Nov 05 15:49:16 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Nov 05 15:49:16 2013 -0500 |
| tree | 0a3fee28a93f580a5474165dbdc3837d580310b6 | |
| parent | 353c78152c10027b8da5de446bad3472f977fcdc [diff] | |
| parent | bbe09bbcf4454e826e3fb08e87d81f32c0030658 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211