Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <[email protected]>
Tue, 10 May 2016 00:54:59 +0000 (17:54 -0700)
committerLinus Torvalds <[email protected]>
Tue, 10 May 2016 00:54:59 +0000 (17:54 -0700)
Merge fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <[email protected]>:
  zsmalloc: fix zs_can_compact() integer overflow
  Revert "proc/base: make prompt shell start from new line after executing "cat /proc/$pid/wchan""


Trivial merge