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: (56 commits)
  doc: fix typo in comment explaining rb_tree usage
  Remove fs/ntfs/ChangeLog
  doc: fix console doc typo
  doc: cpuset: Update the cpuset flag file
  Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
  Remove drivers/parport/ChangeLog
  Remove drivers/char/ChangeLog
  doc: typo - Table 1-2 should refer to "status", not "statm"
  tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
  No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
  devres/irq: Fix devm_irq_match comment
  Remove reference to kthread_create_on_cpu
  tree-wide: Assorted spelling fixes
  tree-wide: fix 'lenght' typo in comments and code
  drm/kms: fix spelling in error message
  doc: capitalization and other minor fixes in pnp doc
  devres: typo fix s/dev/devm/
  Remove redundant trailing semicolons from macros
  fix typo "definetly" -> "definitely" in comment
  tree-wide: s/widht/width/g typo in comments
  ...

Fix trivial conflict in Documentation/laptops/00-INDEX

diff --cc Documentation/laptops/00-INDEX
index f1fc13d,df4fb52..fa68853
--- 1/Documentation/laptops/00-INDEX
--- 2/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
@@@ -2,8 -2,10 +2,12 @@@
        - This file
  acer-wmi.txt
        - information on the Acer Laptop WMI Extras driver.
+ asus-laptop.txt
+       - information on the Asus Laptop Extras driver.
+ disk-shock-protection.txt
+       - information on hard disk shock protection.
 +dslm.c
 +      - Simple Disk Sleep Monitor program
  laptop-mode.txt
        - how to conserve battery power using laptop-mode.
  sony-laptop.txt

diff --cc arch/arm/plat-samsung/include/plat/gpio-cfg-helpers.h
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/nand.h
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/regs-usb-hsotg-phy.h
Simple merge

diff --cc drivers/mmc/host/mxcmmc.c
Simple merge

diff --cc drivers/serial/samsung.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/params.c
Simple merge

diff --cc mm/slub.c
Simple merge