]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 631595f 467c88f)
Merge branch 'x86/core' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 09:16:17 +0000 (10:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 09:17:48 +0000 (10:17 +0100)
commit8293dd6f86e759068ce918aa10ca9c5d6d711cd0
treede366d69078bf2b98c6765fa4ec1cc652f3d3173tree | snapshot
parent631595fbf4aeac260e664a8a002897e4db6a50ddcommit | diff
parent467c88fee51e2ae862e9485245687da0730e29aacommit | diff
Merge branch 'x86/core' into tracing/ftrace

Semantic merge:

  kernel/trace/trace_functions_graph.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/intel.c diff1 | diff2 | blob | history
arch/x86/mm/init_32.c diff1 | diff2 | blob | history
arch/x86/mm/init_64.c diff1 | diff2 | blob | history
kernel/module.c diff1 | diff2 | blob | history
kernel/trace/trace_functions_graph.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.