Linus Torvalds 1dcf58d6e6 Merge branch 'akpm' (patches from Andrew) ... Merge first patchbomb from Andrew Morton: - arch/sh updates - ocfs2 updates - kernel/watchdog feature - about half of mm/ * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (122 commits) Documentation: update arch list in the 'memtest' entry Kconfig: memtest: update number of test patterns up to 17 arm: add support for memtest arm64: add support for memtest memtest: use phys_addr_t for physical addresses mm: move memtest under mm mm, hugetlb: abort __get_user_pages if current has been oom killed mm, mempool: do not allow atomic resizing memcg: print cgroup information when system panics due to panic_on_oom mm: numa: remove migrate_ratelimited mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE mm: split ET_DYN ASLR from mmap ASLR s390: redefine randomize_et_dyn for ELF_ET_DYN_BASE mm: expose arch_mmap_rnd when available s390: standardize mmap_rnd() usage powerpc: standardize mmap_rnd() usage mips: extract logic for mmap_rnd() arm64: standardize mmap_rnd() usage x86: standardize mmap_rnd() usage arm: factor out mmap ASLR into mmap_rnd ...		2015-04-14 16:49:17 -07:00
..
events	Merge branch 'akpm' (patches from Andrew)	2015-04-14 16:49:17 -07:00
define_trace.h	tracing: Add DEFINE_EVENT_FN() macro	2013-06-20 22:24:32 -07:00
ftrace.h	tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values	2015-04-08 09:39:56 -04:00
syscall.h	tracing: Fix syscall_*regfunc() vs copy_process() race	2014-06-21 00:15:12 -04:00