| commit | 133189a46c2c522eb4ef26b1ede63dd0a9fdc920 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jun 22 14:39:53 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jun 22 14:39:53 2012 -0400 |
| tree | 04ab3567c3bea31503c4dfa94909f99dc4b3789f | |
| parent | f761b6947dde42890beea59b020e1be87491809e [diff] | |
| parent | 0f6b3f597daab2254614e2773e322e73fb1b6f4b [diff] |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next