summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-10 00:54:59 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-10 00:54:59 (GMT)
commit5c56b563b4486281bff80658194f0d1da6feba67 (patch)
tree80ab610988c049511122c53078578e538a0b9ffa /kernel
parentb507146bb6b9ac0c0197100ba3e299825a21fed3 (diff)
parent44f43e99fe70833058482d183e99fdfd11220996 (diff)
downloadlinux-5c56b563b4486281bff80658194f0d1da6feba67.tar.xz
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""
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions