| commit | 133eb82f0904049be96a8128b513e19e538fde5d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jun 03 15:55:37 2013 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Jun 03 15:55:37 2013 -0400 |
| tree | fb34518864993d199239ef35a1137102b6fa1a73 | |
| parent | 4da2a54a842db6921289e3e25b0739531a594dea [diff] | |
| parent | ed405be5cb5e8e494e8dcd83b6eb1add34dc752a [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next