| commit | 290eddc4b3661dc4dfa95d199e0be5788928b3b1 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Oct 17 16:23:33 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Oct 17 16:23:33 2012 -0400 |
| tree | 2130a4aab73e43e08b6566b06211069a96a2ff22 | |
| parent | 8f7b8db6e0557c8437adf9371e020cd89a7e85dc [diff] | |
| parent | 3a40414f826a8f1096d9b94c4a53ef91b25ba28d [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211