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/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index 199f374cf9da..f6e108d0125f 100644
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -206,7 +206,7 @@ recv_Bchannel(struct bchannel *bch, unsigned int id)
         hh->id = id;
         if (bch->rcount >= 64) {
                 printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                        "fushing!\n", bch);
+                        "flushing!\n", bch);
                 skb_queue_purge(&bch->rqueue);
                 bch->rcount = 0;
                 return;
@@ -231,7 +231,7 @@ recv_Bchannel_skb(struct bchannel *bch, struct sk_buff *skb)
 {
         if (bch->rcount >= 64) {
                 printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                        "fushing!\n", bch);
+                        "flushing!\n", bch);
                 skb_queue_purge(&bch->rqueue);
                 bch->rcount = 0;
         }
@@ -279,7 +279,7 @@ confirm_Bsend(struct bchannel *bch)
 
         if (bch->rcount >= 64) {
                 printk(KERN_WARNING "B-channel %p receive queue overflow, "
-                        "fushing!\n", bch);
+                        "flushing!\n", bch);
                 skb_queue_purge(&bch->rqueue);
                 bch->rcount = 0;
         }