| commit | 7fd38193d0473acc6e8f108107d0466f07768853 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu May 12 11:46:58 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu May 12 11:46:58 2016 -0400 |
| tree | 076f5d81a643c818dcf6561dad0f3d75d1049dc5 | |
| parent | 488992916c50890fbe5e7057e29681a4c4fdf1f8 [diff] | |
| parent | 46fa38e84b656f80edf83d21144221b0cad18d61 [diff] |
Merge tag 'mac80211-next-for-davem-2016-05-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Johannes Berg says: ==================== Some more work for 4.7, notably: * completion and fixups of nla_put_64_64bit() work * remove a/b/g/n from wext nickname to avoid confusion with 11ac (which wouldn't even fit fully there due to string length restrictions) along with some other minor changes/cleanups. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>