summaryrefslogtreecommitdiff
path: root/fs/nilfs2/btnode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-04 16:39:26 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-04 16:39:26 (GMT)
commitcb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e (patch)
treef5c425230cfce61ddcea0f6c508e345737766022 /fs/nilfs2/btnode.c
parentaafcd5d75797ac423f6a03ce1f801933d4b114dc (diff)
parent30e46b574a1db7d14404e52dca8e1aa5f5155fd2 (diff)
downloadlinux-fsl-qoriq-cb3e4330e697dffaf3d9cefebc9c7e7d39c89f2e.tar.xz
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm changes from Ingo Molnar: "Misc smaller fixes: - a parse_setup_data() boot crash fix - a memblock and an __early_ioremap cleanup - turn the always-on CONFIG_ARCH_MEMORY_PROBE=y into a configurable option and turn it off - it's an unrobust debug facility, it shouldn't be enabled by default" * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: avoid remapping data in parse_setup_data() x86: Use memblock_set_current_limit() to set limit for memblock. mm: Remove unused variable idx0 in __early_ioremap() mm/hotplug, x86: Disable ARCH_MEMORY_PROBE by default
Diffstat (limited to 'fs/nilfs2/btnode.c')
0 files changed, 0 insertions, 0 deletions