summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-08 09:34:35 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-08 09:34:35 +0100
commita6b0786f7f83bcc4d414a2977aaebe2941ebe1de (patch)
treefd7cbdda3de7eaf05eaa01eb3609121cc05828d8 /arch/x86/mm/Makefile
parent3e03fb7f1da2e691644526c0d6df42d778716349 (diff)
parent6a60dd121c5b6c2d827e99b38c1326f2600c3891 (diff)
parent072ba49838b42c873c496d72c91bb237914cf3b6 (diff)
Merge branches 'tracing/ftrace', 'tracing/fastboot', 'tracing/nmisafe' and 'tracing/urgent' into tracing/core