| commit | 066433a6fa9249db2117adcda330a34ae99814b7 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jan 22 15:40:56 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jan 22 15:40:56 2013 -0500 |
| tree | 1ccf31cc8c9ac494d6371073ddead320c927a4d6 | |
| parent | aa3c90b89045b532418feb3eca6ca258920bf702 [diff] | |
| parent | 5a32aff37a02ebc959837f08d09ac8ba65d4f1b0 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next