www.infradead.org Git - users/jedix/linux-maple.git/commitdiff

author	Mauro Carvalho Chehab <mchehab@s-opensource.com>
	Sat, 23 Jul 2016 10:55:59 +0000 (07:55 -0300)
committer	Mauro Carvalho Chehab <mchehab@s-opensource.com>
	Sat, 23 Jul 2016 10:55:59 +0000 (07:55 -0300)

* 'docs-next' of git://git.lwn.net/linux:
  doc-rst: kernel-doc: fix handling of address_space tags
  Revert "doc/sphinx: Enable keep_warnings"
  doc-rst: kernel-doc directive, fix state machine reporter
  docs: deprecate kernel-doc-nano-HOWTO.txt
  doc/sphinx: Enable keep_warnings
  Documentation: add watermark_scale_factor to the list of vm systcl file
  kernel-doc: Fix up warning output
  docs: Get rid of some kernel-documentation warnings

		1	2
scripts/kernel-doc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge