summaryrefslogtreecommitdiff
path: root/net/nfc/nci/lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/nfc/nci/lib.c')
0 files changed, 0 insertions, 0 deletions
t.git/commit/net/netfilter?h=nds-private-remove&id=7a308bb3016f57e5be11a677d15b821536419d36'>7a308bb3016f57e5be11a677d15b821536419d36 (diff)
Merge tag 'v4.10-rc5' into for-linus
Sync up with mainline to apply fixup to a commit that came through power supply tree.
Diffstat (limited to 'net/netfilter')