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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)

1 files changed, 3 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d91de16cf637..56240e724d9a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -745,9 +745,9 @@ config BLK_CGROUP
 
         This option only enables generic Block IO controller infrastructure.
         One needs to also enable actual IO controlling logic/policy. For
-        enabling proportional weight division of disk bandwidth in CFQ seti
-        CONFIG_CFQ_GROUP_IOSCHED=y and for enabling throttling policy set
-        CONFIG_BLK_THROTTLE=y.
+        enabling proportional weight division of disk bandwidth in CFQ, set
+        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+        CONFIG_BLK_DEV_THROTTLING=y.
 
         See Documentation/cgroups/blkio-controller.txt for more information.