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: (42 commits)
  tree-wide: fix misspelling of "definition" in comments
  reiserfs: fix misspelling of "journaled"
  doc: Fix a typo in slub.txt.
  inotify: remove superfluous return code check
  hdlc: spelling fix in find_pvc() comment
  doc: fix regulator docs cut-and-pasteism
  mtd: Fix comment in Kconfig
  doc: Fix IRQ chip docs
  tree-wide: fix assorted typos all over the place
  drivers/ata/libata-sff.c: comment spelling fixes
  fix typos/grammos in Documentation/edac.txt
  sysctl: add missing comments
  fs/debugfs/inode.c: fix comment typos
  sgivwfb: Make use of ARRAY_SIZE.
  sky2: fix sky2_link_down copy/paste comment error
  tree-wide: fix typos "couter" -> "counter"
  tree-wide: fix typos "offest" -> "offset"
  fix kerneldoc for set_irq_msi()
  spidev: fix double "of of" in comment
  comment typo fix: sybsystem -> subsystem
  ...

4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 2ae7f648effe..bb69f3719f9a 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -344,7 +344,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
         if (ret)
                 return ret;
 
-        err("Unkown Anysee version: %02x %02x %02x. "\
+        err("Unknown Anysee version: %02x %02x %02x. "\
             "Please report the <linux-dvb@linuxtv.org>.",
             hw_info[0], hw_info[1], hw_info[2]);
 
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index eeef50bff4f9..5c0126dc1ff9 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -242,7 +242,7 @@ static struct dvb_usb_device_properties dibusb1_1_properties = {
                         { &dibusb_dib3000mb_table[9],  &dibusb_dib3000mb_table[11], NULL },
                         { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL },
                 },
-                {       "Unkown USB1.1 DVB-T device ???? please report the name to the author",
+                {       "Unknown USB1.1 DVB-T device ???? please report the name to the author",
                         { &dibusb_dib3000mb_table[13], NULL },
                         { &dibusb_dib3000mb_table[14], NULL },
                 },
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index edde87c6aa3a..6b5ded9e7d5d 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -259,7 +259,7 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d,
                         *state = REMOTE_KEY_REPEAT;
                         break;
                 default:
-                        deb_err("unkown type of remote status: %d\n",keybuf[0]);
+                        deb_err("unknown type of remote status: %d\n",keybuf[0]);
                         break;
         }
         return 0;
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c
index 9da2cc95ca13..f9702e3756b6 100644
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -56,7 +56,7 @@ static void usb_urb_complete(struct urb *urb)
                                 stream->complete(stream, b, urb->actual_length);
                         break;
                 default:
-                        err("unkown endpoint type in completition handler.");
+                        err("unknown endpoint type in completition handler.");
                         return;
         }
         usb_submit_urb(urb,GFP_ATOMIC);
@@ -228,7 +228,7 @@ int usb_urb_init(struct usb_data_stream *stream, struct usb_data_stream_properti
                 case USB_ISOC:
                         return usb_isoc_urb_init(stream);
                 default:
-                        err("unkown URB-type for data transfer.");
+                        err("unknown URB-type for data transfer.");
                         return -EINVAL;
         }
 }