| commit | 5c56b563b4486281bff80658194f0d1da6feba67 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 09 17:54:59 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 09 17:54:59 2016 -0700 |
| tree | 80ab610988c049511122c53078578e538a0b9ffa | |
| parent | b507146bb6b9ac0c0197100ba3e299825a21fed3 [diff] | |
| parent | 44f43e99fe70833058482d183e99fdfd11220996 [diff] |
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""