From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Aug 2013 02:31:33 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew Morton)
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c95389b4cd6a4b52af78bea706a274453e886251;p=linux-beck.git

Merge branch 'akpm' (patches from Andrew Morton)

Merge fixes from Andrew Morton:
 "Five fixes.

  err, make that six.  let me try again"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  fs/ocfs2/super.c: Use bigger nodestr to accomodate 32-bit node numbers
  memcg: check that kmem_cache has memcg_params before accessing it
  drivers/base/memory.c: fix show_mem_removable() to handle missing sections
  IPC: bugfix for msgrcv with msgtyp < 0
  Omnikey Cardman 4000: pull in ioctl.h in user header
  timer_list: correct the iterator for timer_list
---

c95389b4cd6a4b52af78bea706a274453e886251