diff options
| author | Linus Torvalds <[email protected]> | 2016-09-28 23:20:24 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-09-28 23:20:24 +0000 |
| commit | 53061afee43bc5041b67a45b6d793e7afdcf9ca7 (patch) | |
| tree | ed7e918bd7323ded4bdd899aded6384488dad9a4 /net/switchdev/switchdev.c | |
| parent | Merge tag 'for-linus-20160928' of git://git.infradead.org/linux-mtd (diff) | |
| parent | mem-hotplug: use nodes that contain memory as mask in new_node_page() (diff) | |
| download | kernel-53061afee43bc5041b67a45b6d793e7afdcf9ca7.tar.gz kernel-53061afee43bc5041b67a45b6d793e7afdcf9ca7.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"4 fixes"
* emailed patches from Andrew Morton <[email protected]>:
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 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions