summaryrefslogtreecommitdiffstats
path: root/fs/romfs/Kconfig
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2012-12-18 12:46:20 +0200
committerPekka Enberg <penberg@kernel.org>2012-12-18 12:46:20 +0200
commit08afe22c68d8c07e8e31ee6491c37f36199ba14b (patch)
tree875d203149b74fddb50522fd5df3d6b154f5fe1e /fs/romfs/Kconfig
parenta304f836a2e6d257c1f918b3431f97ef6b33e02e (diff)
parent4590685546a374fb0f60682ce0e3a6fd48911d46 (diff)
downloadlinux-08afe22c68d8c07e8e31ee6491c37f36199ba14b.tar.bz2
Merge branch 'slab/next' into slab/for-linus
Fix up a trivial merge conflict with commit baaf1dd ("mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab tree. Conflicts: mm/slob.c Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'fs/romfs/Kconfig')
0 files changed, 0 insertions, 0 deletions