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

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index fcc23e4e0b3c..f2204cb1ccdf 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3617,7 +3617,7 @@ int r100_ib_test(struct radeon_device *rdev)
         if (i < rdev->usec_timeout) {
                 DRM_INFO("ib test succeeded in %u usecs\n", i);
         } else {
-                DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",
+                DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",
                           scratch, tmp);
                 r = -EINVAL;
         }
@@ -3637,13 +3637,13 @@ int r100_ib_init(struct radeon_device *rdev)
 
         r = radeon_ib_pool_init(rdev);
         if (r) {
-                dev_err(rdev->dev, "failled initializing IB pool (%d).\n", r);
+                dev_err(rdev->dev, "failed initializing IB pool (%d).\n", r);
                 r100_ib_fini(rdev);
                 return r;
         }
         r = r100_ib_test(rdev);
         if (r) {
-                dev_err(rdev->dev, "failled testing IB (%d).\n", r);
+                dev_err(rdev->dev, "failed testing IB (%d).\n", r);
                 r100_ib_fini(rdev);
                 return r;
         }
@@ -3799,12 +3799,12 @@ static int r100_startup(struct radeon_device *rdev)
         /* 1M ring buffer */
         r = r100_cp_init(rdev, 1024 * 1024);
         if (r) {
-                dev_err(rdev->dev, "failled initializing CP (%d).\n", r);
+                dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
                 return r;
         }
         r = r100_ib_init(rdev);
         if (r) {
-                dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
+                dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
                 return r;
         }
         return 0;