| commit | efec22b4689bbfdbed26367219e981fcc946b9a6 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Oct 29 14:14:48 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Oct 29 14:14:48 2012 -0400 |
| tree | eee6bb1c6109dd52e4bb6113ab61ad8d5dfa8047 | |
| parent | f89ff6441df06abc2d95f3ef67525923032d6283 [diff] | |
| parent | 6dbda2d00d466225f9db1dc695ff852443f28832 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211