| commit | 3e497e0215ae1d552a69bd88ea0d1a004f71cccd | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Jul 19 12:35:00 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Jul 19 12:35:00 2012 -0400 |
| tree | 9684b54d4d55aaddc98ddc46d069d9a423d92034 | |
| parent | 0cd06647b7c24f6633e32a505930a9aa70138c22 [diff] | |
| parent | 99102bd380f27b8dd5e058e69e3203bfad0cad94 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next