projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b507146 44f43e9)
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 May 2016 00:54:59 +0000 (17:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 May 2016 00:54:59 +0000 (17:54 -0700)
commit5c56b563b4486281bff80658194f0d1da6feba67
tree80ab610988c049511122c53078578e538a0b9ffatree | snapshot
parentb507146bb6b9ac0c0197100ba3e299825a21fed3commit | diff
parent44f43e99fe70833058482d183e99fdfd11220996commit | 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""
John Crispins staging tree