tree 5a38c79aeac28587548c8a6635269c1c6b3b5012
parent ce7613db2d8d4d5af2587ab5d7090055c4562201
parent ffddc5fd19b219f557fd4a81168ce8784a4faced
author Linus Torvalds <torvalds@linux-foundation.org> 1397001065 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397001065 -0700

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