diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 10:56:25 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 10:56:25 -0600 |
| commit | f2937e4540836be5c4db7e0a721ce3cfc59036e3 (patch) | |
| tree | f7c68473490deabbe334279a132bc87816eaf694 /mm/internal.h | |
| parent | 1d508f8ace3e78e96da70f1cf4e36b80f22b5fa9 (diff) | |
| parent | a2a368d905472293d4e13d09fdd9e537edc74347 (diff) | |
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/internal.h')
0 files changed, 0 insertions, 0 deletions