summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-03-19 17:20:49 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2014-03-19 17:20:49 +1100
commit285b0c1f17695658040671fd490fa08b830e6e3a (patch)
tree95f18d9118ad6e6dc3801514d6daa18900615149 /arch/x86/Kconfig
parent6c03e929f06be2f886ffd90cfcfd3bfffb43b17d (diff)
parent3611f0abb13dde23afad9742f8a1b949f262bd12 (diff)
Merge branch 'akpm-current/current'
Conflicts: fs/fs-writeback.c
Diffstat (limited to 'arch/x86/Kconfig')
0 files changed, 0 insertions, 0 deletions