From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 May 2016 00:54:59 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5c56b563b4486281bff80658194f0d1da6feba67;p=deliverable%2Flinux.git

Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "2 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  zsmalloc: fix zs_can_compact() integer overflow
  Revert "proc/base: make prompt shell start from new line after executing "cat /proc/$pid/wchan""
---

5c56b563b4486281bff80658194f0d1da6feba67