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, 8 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7d6e12dbdffa..a71e04b93edf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2376,7 +2376,7 @@ F:	include/linux/edac_mce.h
 
 EDAC-I82975X
 M:      Ranganathan Desikan <ravi@jetztechnologies.com>
-M:      "Arvind R." <arvind@jetztechnologies.com>
+M:      "Arvind R." <arvino55@gmail.com>
 L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      bluesmoke.sourceforge.net
 S:      Maintained
@@ -3472,6 +3472,7 @@ F:	net/ipx/
 IRDA SUBSYSTEM
 M:      Samuel Ortiz <samuel@sortiz.org>
 L:      irda-users@lists.sourceforge.net (subscribers-only)
+L:      netdev@vger.kernel.org
 W:      http://irda.sourceforge.net/
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
@@ -3909,6 +3910,12 @@ L:	linux-security-module@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
 S:      Supported
 
+LIS3LV02D ACCELEROMETER DRIVER
+M:      Eric Piel <eric.piel@tremplin-utc.net>
+S:      Maintained
+F:      Documentation/hwmon/lis3lv02d
+F:      drivers/hwmon/lis3lv02d.*
+
 LLC (802.2)
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:      Maintained
@@ -3916,12 +3923,6 @@ F:	include/linux/llc.h
 F:      include/net/llc*
 F:      net/llc/
 
-LIS3LV02D ACCELEROMETER DRIVER
-M:      Eric Piel <eric.piel@tremplin-utc.net>
-S:      Maintained
-F:      Documentation/hwmon/lis3lv02d
-F:      drivers/hwmon/lis3lv02d.*
-
 LM73 HARDWARE MONITOR DRIVER
 M:      Guillaume Ligneul <guillaume.ligneul@gmail.com>
 L:      lm-sensors@lm-sensors.org