Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "Usual earth-shaking, news-breaking, rocket science pile from
  trivial.git"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
  doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
  doc: add missing files to timers/00-INDEX
  timekeeping: Fix some trivial typos in comments
  mm: Fix some trivial typos in comments
  irq: Fix some trivial typos in comments
  NUMA: fix typos in Kconfig help text
  mm: update 00-INDEX
  doc: Documentation/DMA-attributes.txt fix typo
  DRM: comment: `halve' -> `half'
  Docs: Kconfig: `devlopers' -> `developers'
  doc: typo on word accounting in kprobes.c in mutliple architectures
  treewide: fix "usefull" typo
  treewide: fix "distingush" typo
  mm/Kconfig: Grammar s/an/a/
  kexec: Typo s/the/then/
  Documentation/kvm: Update cpuid documentation for steal time and pv eoi
  treewide: Fix common typo in "identify"
  __page_to_pfn: Fix typo in comment
  Correct some typos for word frequency
  clk: fixed-factor: Fix a trivial typo
  ...

2 files changed, 2 insertions, 2 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index de31af256207..eb69f352401d 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -20,7 +20,7 @@ config FLATMEM_MANUAL
 
           Some users of more advanced features like NUMA and
           memory hotplug may have different options here.
-          DISCONTIGMEM is an more mature, better tested system,
+          DISCONTIGMEM is a more mature, better tested system,
           but is incompatible with memory hotplug and may suffer
           decreased performance over SPARSEMEM.  If unsure between
           "Sparse Memory" and "Discontiguous Memory", choose
diff --git a/mm/slub.c b/mm/slub.c
index 92737a0b787b..7e8bd8d828bc 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -955,7 +955,7 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x)
         kmemleak_free_recursive(x, s->flags);
 
         /*
-         * Trouble is that we may no longer disable interupts in the fast path
+         * Trouble is that we may no longer disable interrupts in the fast path
          * So in order to make the debug calls that expect irqs to be
          * disabled we need to disable interrupts temporarily.
          */