diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-28 23:20:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-28 23:20:24 (GMT) |
| commit | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (patch) | |
| tree | ed7e918bd7323ded4bdd899aded6384488dad9a4 /kernel | |
| parent | ae6dd8d61913b5341067c7c660e8e91430d22e7c (diff) | |
| parent | 231e97e2b8ec9a1556ced5d8a89cda03a480b179 (diff) | |
| download | linux-53061afee43bc5041b67a45b6d793e7afdcf9ca7.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mem-hotplug: use nodes that contain memory as mask in new_node_page()
scripts/recordmcount.c: account for .softirqentry.text
dma-mapping.h: preserve unmap info for CONFIG_DMA_API_DEBUG
mm,ksm: fix endless looping in allocating memory when ksm enable
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions