Merge branch 'akpm' (patches from Andrew Morton)
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Aug 2013 02:31:33 +0000 (19:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Aug 2013 02:31:33 +0000 (19:31 -0700)
commitc95389b4cd6a4b52af78bea706a274453e886251
tree01e0046bdef0121e57ebecbead1d757494dcbd13
parent98474236f72e5a8b89c14cd7c74f0bb77a4b1a99
parent49fa8140e487b492da24c76ac3cccad0a0ae63e4
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