summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-06 18:44:14 +0300
committerIngo Molnar <mingo@elte.hu>2009-03-06 18:45:01 +0300
commitf0ef03985130287c6c84ebe69416cf790e6cc00e (patch)
tree3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /README
parent16097439703bcd38e9fe5608c12add6dacb825ea (diff)
parent31bbed527e7039203920c51c9fb48c27aed0820c (diff)
downloadlinux-f0ef03985130287c6c84ebe69416cf790e6cc00e.tar.xz
Merge branch 'x86/core' into tracing/textedit
Conflicts: arch/x86/Kconfig block/blktrace.c kernel/irq/handle.c Semantic conflict: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions