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

Pull trivial tree from Jiri Kosina:
 "The usual trivial updates all over the tree -- mostly typo fixes and
  documentation updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
  doc: Documentation/cputopology.txt fix typo
  treewide: Convert retrun typos to return
  Fix comment typo for init_cma_reserved_pageblock
  Documentation/trace: Correcting and extending tracepoint documentation
  mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
  power: Documentation: Update s2ram link
  doc: fix a typo in Documentation/00-INDEX
  Documentation/printk-formats.txt: No casts needed for u64/s64
  doc: Fix typo "is is" in Documentations
  treewide: Fix printks with 0x%#
  zram: doc fixes
  Documentation/kmemcheck: update kmemcheck documentation
  doc: documentation/hwspinlock.txt fix typo
  PM / Hibernate: add section for resume options
  doc: filesystems : Fix typo in Documentations/filesystems
  scsi/megaraid fixed several typos in comments
  ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
  treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
  page_isolation: Fix a comment typo in test_pages_isolated()
  doc: fix a typo about irq affinity
  ...

1 files changed, 5 insertions, 4 deletions

diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram
index ec93fe33baa6..3f0b9ae61d8c 100644
--- a/Documentation/ABI/testing/sysfs-block-zram
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -5,20 +5,21 @@ Description:
                 The disksize file is read-write and specifies the disk size
                 which represents the limit on the *uncompressed* worth of data
                 that can be stored in this disk.
+                Unit: bytes
 
 What:           /sys/block/zram<id>/initstate
 Date:           August 2010
 Contact:        Nitin Gupta <ngupta@vflare.org>
 Description:
-                The disksize file is read-only and shows the initialization
+                The initstate file is read-only and shows the initialization
                 state of the device.
 
 What:           /sys/block/zram<id>/reset
 Date:           August 2010
 Contact:        Nitin Gupta <ngupta@vflare.org>
 Description:
-                The disksize file is write-only and allows resetting the
-                device. The reset operation frees all the memory assocaited
+                The reset file is write-only and allows resetting the
+                device. The reset operation frees all the memory associated
                 with this device.
 
 What:           /sys/block/zram<id>/num_reads
@@ -48,7 +49,7 @@ Contact:	Nitin Gupta <ngupta@vflare.org>
 Description:
                 The notify_free file is read-only and specifies the number of
                 swap slot free notifications received by this device. These
-                notifications are send to a swap block device when a swap slot
+                notifications are sent to a swap block device when a swap slot
                 is freed. This statistic is applicable only when this disk is
                 being used as a swap disk.