From: Linus Torvalds Date: Fri, 10 Oct 2014 02:26:14 +0000 (-0400) Subject: Merge branch 'akpm' (fixes from Andrew Morton) X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0cf744bc7ae8e0072159a901f6e1a159bbc30ffa;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'akpm' (fixes from Andrew Morton) Merge patch-bomb from Andrew Morton: - part of OCFS2 (review is laggy again) - procfs - slab - all of MM - zram, zbud - various other random things: arch, filesystems. * emailed patches from Andrew Morton : (164 commits) nosave: consolidate __nosave_{begin,end} in include/linux/screen_info.h: remove unused ORIG_* macros kernel/sys.c: compat sysinfo syscall: fix undefined behavior kernel/sys.c: whitespace fixes acct: eliminate compile warning kernel/async.c: switch to pr_foo() include/linux/blkdev.h: use NULL instead of zero include/linux/kernel.h: deduplicate code implementing clamp* macros include/linux/kernel.h: rewrite min3, max3 and clamp using min and max alpha: use Kbuild logic to include frv: remove deprecated IRQF_DISABLED frv: remove unused cpuinfo_frv and friends to fix future build error zbud: avoid accessing last unused freelist zsmalloc: simplify init_zspage free obj linking mm/zsmalloc.c: correct comment for fullness group computation zram: use notify_free to account all free notifications zram: report maximum used memory zram: zram memory size limitation zsmalloc: change return value unit of zs_get_total_size_bytes zsmalloc: move pages_allocated to zs_pool ... --- 0cf744bc7ae8e0072159a901f6e1a159bbc30ffa