summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-20 15:17:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-20 15:17:55 -0800
commit1351522b5f627f06e44e781805b5bd5c01566cf3 (patch)
treee44eaf09047de1de798a2939d1cecd2b87253b3a /net/nfc
parentd5379e5eddc09f8d172d9d6aa0e5a269a89dc60a (diff)
parent217e2bfab22e740227df09f22165e834cddd8a3b (diff)
Merge tag 'doc-4.10-3' of git://git.lwn.net/linux
Pull documentation fix from Jonathan Corbet: "A single fix for the build system. It would appear that the docutils developers, in their wisdom, broke the API in the 0.13 release. This fix detects the breakage and allows the docs to be built with both the old and new versions" * tag 'doc-4.10-3' of git://git.lwn.net/linux: docs: sphinx-extensions: make rstFlatTable work with docutils 0.13
Diffstat (limited to 'net/nfc')
0 files changed, 0 insertions, 0 deletions
93217746f9a506ee8a'>diff)
Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni: "A single fix for this cycle. It is worth taking it for 4.10 so that distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to y in their config. Summary: - Allow jz4740 to build as a module again by using kernel_halt()" * tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: jz4740: make the driver buildable as a module again
Diffstat (limited to 'sound/soc/codecs/max9850.h')