| commit | 89b59bcd3ad54c5cd5540ae12275f738dad333fb | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Aug 02 14:54:19 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Aug 02 14:54:19 2013 -0400 |
| tree | 67bc4454694a1df9d30fa6cd7474af1ae3c79ed1 | |
| parent | 788f7a56fce1bcb2067b62b851a086fca48a0056 [diff] | |
| parent | ddfe49b42d8ad4bfdf92d63d4a74f162660d878d [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211