]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2016 03:54:20 +0000 (12:54 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2016 03:54:20 +0000 (12:54 +0900)
Merge misc fixes from Andrew Morton:
 "Five fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  pps: do not crash when failed to register
  tools/vm/slabinfo: fix an unintentional printf
  testing/radix-tree: fix a macro expansion bug
  radix-tree: fix radix_tree_iter_retry() for tagged iterators.
  mm: memcontrol: fix cgroup creation failure after many small jobs


Trivial merge