From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Apr 2014 23:51:05 +0000 (-0700)
Subject: Merge branch 'akpm' (incoming from Andrew)
X-Git-Tag: v3.15-rc1~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f386a7074aa758720a4fc1fa26123044849bcc6;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'akpm' (incoming from Andrew)

Merge a few more patches from Andrew Morton:
 "A few leftovers"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  fs/ncpfs/dir.c: fix indenting in ncp_lookup()
  ncpfs/inode.c: fix mismatch printk formats and arguments
  ncpfs: remove now unused PRINTK macro
  ncpfs: convert PPRINTK to ncp_vdbg
  ncpfs: convert DPRINTK/DDPRINTK to ncp_dbg
  ncpfs: Add pr_fmt and convert printks to pr_<level>
  arch/x86/mm/kmemcheck/kmemcheck.c: use kstrtoint() instead of sscanf()
  lib/percpu_counter.c: fix bad percpu counter state during suspend
  autofs4: check dev ioctl size before allocating
  mm: vmscan: do not swap anon pages just because free+file is low
---

0f386a7074aa758720a4fc1fa26123044849bcc6