Commit 69a7aebc 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 tree from Jiri Kosina:
 "It's indeed trivial -- mostly documentation updates and a bunch of
  typo fixes from Masanari.

  There are also several linux/version.h include removals from Jesper."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
  kcore: fix spelling in read_kcore() comment
  constify struct pci_dev * in obvious cases
  Revert "char: Fix typo in viotape.c"
  init: fix wording error in mm_init comment
  usb: gadget: Kconfig: fix typo for 'different'
  Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
  writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
  writeback: fix typo in the writeback_control comment
  Documentation: Fix multiple typo in Documentation
  tpm_tis: fix tis_lock with respect to RCU
  Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
  Doc: Update numastat.txt
  qla4xxx: Add missing spaces to error messages
  compiler.h: Fix typo
  security: struct security_operations kerneldoc fix
  Documentation: broken URL in libata.tmpl
  Documentation: broken URL in filesystems.tmpl
  mtd: simplify return logic in do_map_probe()
  mm: fix comment typo of truncate_inode_pages_range
  power: bq27x00: Fix typos in comment
  ...
parents d464c92b f1f996b6

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line. 


Following translations are available on the WWW:



   - Japanese, maintained by the JF Project (JF@linux.or.jp), at

     http://www.linux.or.jp/JF/

   - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at

     http://linuxjf.sourceforge.jp/



00-INDEX

	- this file.

Documentation/ABI/obsolete/sysfs-class-rfkill

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Date: 09-Jul-2007 
KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and sheduled to be removed in 2014,

		This file is deprecated and scheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

Documentation/ABI/stable/sysfs-module

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Description: 
		The name of the module that is in the kernel.  This

		module name will show up either if the module is built

		directly into the kernel, or if it is loaded as a

		dyanmic module.

		dynamic module.



	/sys/module/MODULENAME/parameters

		This directory contains individual files that are each

Documentation/DocBook/filesystems.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ an example. 
     <title>See also</title>

	<para>

	  <citation>

	   <ulink url="ftp://ftp.uk.linux.org/pub/linux/sct/fs/jfs/journal-design.ps.gz">

	   <ulink url="http://kernel.org/pub/linux/kernel/people/sct/ext3/journal-design.ps.gz">

	   	Journaling the Linux ext2fs Filesystem, LinuxExpo 98, Stephen Tweedie

	   </ulink>

	  </citation>

Documentation/DocBook/libata.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
   <para>

   The contents of this file are subject to the Open

   Software License version 1.1 that can be found at

   <ulink url="http://www.opensource.org/licenses/osl-1.1.txt">http://www.opensource.org/licenses/osl-1.1.txt</ulink> and is included herein

   by reference.

   <ulink url="http://fedoraproject.org/wiki/Licensing:OSL1.1">http://fedoraproject.org/wiki/Licensing:OSL1.1</ulink>

   and is included herein by reference.

   </para>



   <para>
@@ -945,7 +945,7 @@ and other resources, etc. 


        <listitem>

	<para>

	!BSY &amp;&amp; ERR after CDB tranfer starts but before the

	!BSY &amp;&amp; ERR after CDB transfer starts but before the

        last byte of CDB is transferred.  ATA/ATAPI standard states

        that &quot;The device shall not terminate the PACKET command

        with an error before the last byte of the command packet has
@@ -1050,7 +1050,7 @@ and other resources, etc. 
	   to complete a command.  Combined with the fact that MWDMA

	   and PIO transfer errors aren't allowed to use ICRC bit up to

	   ATA/ATAPI-7, it seems to imply that ABRT bit alone could

	   indicate tranfer errors.

	   indicate transfer errors.

	   </para>

	   <para>

	   However, ATA/ATAPI-8 draft revision 1f removes the part

CRA Git | Maintained and supported by SUSTech CRA and CCSE