summaryrefslogtreecommitdiff
path: root/net/nfc/rawsock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-06 14:37:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-06 14:37:55 -0800
commit72df5eba704252e54b5b19395cb938f8bb55cab8 (patch)
tree9b9dd6aa0cd3b6cda738de32dd05075e6e66bab1 /net/nfc/rawsock.c
parent396bf4cd835e62d70fad4a03a8963e61f19021f2 (diff)
parentf9f96fc10c09ca16e336854c08bc1563eed97985 (diff)
Merge tag 'media/v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: "A few documentation fixes at CEC (with got promoted from staging for 4.10), and one fix on its core." * tag 'media/v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] cec: fix wrong last_la determination [media] cec-intro.rst: mention the v4l-utils package and CEC utilities [media] cec rst: remove "This API is not yet finalized" notice
Diffstat (limited to 'net/nfc/rawsock.c')
0 files changed, 0 insertions, 0 deletions