summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/pn533
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-06-13 13:52:37 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-13 13:52:37 -0400
commit0e74008b668febb7ae024c7ee04b30dcbd1f1efd (patch)
tree5855fc175486d4f4b1a79cbaaf26b5967569e584 /drivers/nfc/pn533
parent5952b0200e9a0b0bfcc367d03a8caeb53e42545e (diff)
parent4524667b1e6801a92a4de066788e558b71fe323a (diff)
downloadlinux-0e74008b668febb7ae024c7ee04b30dcbd1f1efd.tar.bz2
Merge tag 'mac80211-next-for-davem-2017-06-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== A couple of weeks worth of updates - looks like things are quiet: * merged net-next back to get a patch from net that another patch here depends on * various small improvements/cleanups across the board * 4-way handshake offload (many thanks to Arend for shepherding that) * mesh CSA/DFS support in mac80211 * the skb_put_zero() we discussed previously ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/pn533')
0 files changed, 0 insertions, 0 deletions