| commit | ead0ad1648990638e624f57d446f1fa4c577d87d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Jan 22 14:23:13 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Jan 22 14:23:13 2013 -0500 |
| tree | 674063d85501781b4aeaf8e4f97a965a22cdfa3e | |
| parent | cb4ec37d485b05decf4bdcd11724362c7f03606a [diff] | |
| parent | 8680451f38a64bd270233b3c0eeb7c45f2b5efe3 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211