From: Linus Torvalds Date: Fri, 19 Dec 2014 03:08:25 +0000 (-0800) Subject: Merge branch 'akpm' (patches from Andrew) X-Git-Tag: v3.19-rc1~31 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=018cb13eb33383cbc3fb6d3a286ef32ecb816779;p=cascardo%2Flinux.git Merge branch 'akpm' (patches from Andrew) Merge misc patches from Andrew Morton: "A few stragglers" * emailed patches from Andrew Morton : tools/testing/selftests/Makefile: alphasort the TARGETS list mm/zsmalloc: adjust order of functions ocfs2: fix journal commit deadlock ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker ocfs2: reflink: fix slow unlink for refcounted file mm/memory.c:do_shared_fault(): add comment .mailmap: Santosh Shilimkar has moved .mailmap: update akpm@osdl.org lib/show_mem.c: add cma reserved information fs/proc/meminfo.c: include cma info in proc/meminfo mm: cma: split cma-reserved in dmesg log hfsplus: fix longname handling mm/mempolicy.c: remove unnecessary is_valid_nodemask() --- 018cb13eb33383cbc3fb6d3a286ef32ecb816779