summaryrefslogtreecommitdiffstats
path: root/mm/hwpoison-inject.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-14 18:56:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-14 18:56:25 +0200
commitf2937e4540836be5c4db7e0a721ce3cfc59036e3 (patch)
treef7c68473490deabbe334279a132bc87816eaf694 /mm/hwpoison-inject.c
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff)
parentmm: fix CROSS_MEMORY_ATTACH help text grammar (diff)
downloadlinux-f2937e4540836be5c4db7e0a721ce3cfc59036e3.tar.xz
linux-f2937e4540836be5c4db7e0a721ce3cfc59036e3.zip
Merge branch 'akpm' (fixes from Andrew Morton)
Merge leftovers from Andrew Morton: "A few leftovers. I have a bunch of OCFS2 patches which are still out for review and which I might sneak along after -rc1. Partly my fault - I should send my review pokes out earlier" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: fix CROSS_MEMORY_ATTACH help text grammar drivers/mfd/rtsx_usb.c: export device table mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size
Diffstat (limited to 'mm/hwpoison-inject.c')
0 files changed, 0 insertions, 0 deletions