2 Commits

Author	SHA1	Message	Date
Greg Kroah-Hartman	5826bb3260	Merge 458ef2a25e Merge tag 'x86-timers-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into android-mainline ... In a quest to make the huge -rc1 merge easier to handle and bisect, merge the first chunk of 5.7-rc1 patches into android-mainline. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ib54436e9515660a4c0c25c49c21bfb399eb57921	2020-03-31 14:01:10 +02:00
Mauro Carvalho Chehab	c33e97efa9	docs: filesystems: convert proc.txt to ReST ... This document has a nice format! Unfortunately, not exactly ReST. So, several adjustments were required: - Add a SPDX header; - Adjust document and section titles; - Whitespace fixes and new line breaks; - Mark literal blocks as such; - Add table markups; - Add table captions; - Add it to filesystems/index.rst. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Link: https://lore.kernel.org/r/1d113d860188de416ca3b0b97371dc2195433d5b.1581955849.git.mchehab+huawei@kernel.org Signed-off-by: Jonathan Corbet <corbet@lwn.net>	2020-03-02 14:04:40 -07:00