| commit | c66cfd5325bb215a251f4685fac8718b1da33197 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Tue Dec 11 16:04:03 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Tue Dec 11 16:04:03 2012 -0500 |
| tree | 7c8ed5289c4a99ffcd2588ac48b5a512312a375b | |
| parent | ecbbec2eb093d2ef205de371af986f0360fca539 [diff] | |
| parent | 8acbcddb5fb3a1dc081defe51b6ac42a7ab0b398 [diff] |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next