Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2013a13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial branch from Jiri Kosina:
 "Usual stuff -- comment/printk typo fixes, documentation updates, dead
  code elimination."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  HOWTO: fix double words typo
  x86 mtrr: fix comment typo in mtrr_bp_init
  propagate name change to comments in kernel source
  doc: Update the name of profiling based on sysfs
  treewide: Fix typos in various drivers
  treewide: Fix typos in various Kconfig
  wireless: mwifiex: Fix typo in wireless/mwifiex driver
  messages: i2o: Fix typo in messages/i2o
  scripts/kernel-doc: check that non-void fcts describe their return value
  Kernel-doc: Convention: Use a "Return" section to describe return values
  radeon: Fix typo and copy/paste error in comments
  doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
  various: Fix spelling of "asynchronous" in comments.
  Fix misspellings of "whether" in comments.
  eisa: Fix spelling of "asynchronous".
  various: Fix spelling of "registered" in comments.
  doc: fix quite a few typos within Documentation
  target: iscsi: fix comment typos in target/iscsi drivers
  treewide: fix typo of "suport" in various comments and Kconfig
  treewide: fix typo of "suppport" in various comments
  ...
parents dadfab48 106f9d93

Documentation/ABI/testing/dev-kmsg

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ Description: The /dev/kmsg character device node provides userspace access 
		The flags field carries '-' by default. A 'c' indicates a

		fragment of a line. All following fragments are flagged with

		'+'. Note, that these hints about continuation lines are not

		neccessarily correct, and the stream could be interleaved with

		necessarily correct, and the stream could be interleaved with

		unrelated messages, but merging the lines in the output

		usually produces better human readable results. A similar

		logic is used internally when messages are printed to the

Documentation/ABI/testing/sysfs-devices-power

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ Contact: Rafael J. Wysocki <rjw@sisk.pl> 
Description:

		The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute

		contains the total time the device has been preventing

		opportunistic transitions to sleep states from occuring.

		opportunistic transitions to sleep states from occurring.

		This attribute is read-only.  If the device is not enabled to

		wake up the system from sleep states, this attribute is not

		present.

Documentation/ABI/testing/sysfs-driver-ppi

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Contact: xiaoyan.zhang@intel.com 
Description:

		This folder includes the attributes related with PPI (Physical

		Presence Interface). Only if TPM is supported by BIOS, this

		folder makes sence. The folder path can be got by command

		folder makes sense. The folder path can be got by command

		'find /sys/ -name 'pcrs''. For the detail information of PPI,

		please refer to the PPI specification from

		http://www.trustedcomputinggroup.org/

Documentation/ABI/testing/sysfs-profiling

+3 −3
Original line number Diff line number Diff line 
What:		/sys/kernel/profile

What:		/sys/kernel/profiling

Date:		September 2008

Contact:	Dave Hansen <dave@linux.vnet.ibm.com>

Description:

		/sys/kernel/profile is the runtime equivalent

		/sys/kernel/profiling is the runtime equivalent

		of the boot-time profile= option.



		You can get the same effect running:



			echo 2 > /sys/kernel/profile

			echo 2 > /sys/kernel/profiling



		as you would by issuing profile=2 on the boot

		command line.

Documentation/HOWTO

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ Differences between the kernel community and corporate structures 


The kernel community works differently than most traditional corporate

development environments.  Here are a list of things that you can try to

do to try to avoid problems:

do to avoid problems:

  Good things to say regarding your proposed changes:

    - "This solves multiple problems."

    - "This deletes 2000 lines of code."