| commit | f6595444c1ee798f9c227107bb3ab14730c6497a | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Apr 30 12:04:27 2014 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Apr 30 12:04:27 2014 -0400 |
| tree | e8e06d7c2057c69e19848ee3abd6720927f5f9f9 | |
| parent | 0006433a5be9e0e155ad493e33c6e9bf3868a87f [diff] | |
| parent | f55ee0834247c88cb6981cb11eb1870392878371 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Conflicts: net/mac80211/chan.c