Ingo Molnar f0ef039851 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>		2009-03-06 16:45:01 +01:00
..
alpha	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
arm	Merge branch 'x86/urgent' into x86/core	2009-03-05 21:48:50 +01:00
avr32	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
blackfin	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
cris	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
frv
h8300	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
ia64	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
m32r
m68k	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
m68knommu
mips	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
mn10300
parisc	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
powerpc	Merge branch 'x86/urgent' into x86/core	2009-03-05 21:48:50 +01:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-03-03 17:05:08 -08:00
sh	sh: ap325rxa: Revert ov772x support.	2009-02-27 15:41:14 +09:00
sparc	Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup-lzma', 'x86/signal' and 'x86/urgent' into x86/core	2009-03-04 02:22:31 +01:00
um	tracing: make CALLER_ADDRx overwriteable	2009-03-02 16:49:37 -05:00
x86	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
xtensa	Merge branch 'x86/core' into tracing/textedit	2009-03-06 16:45:01 +01:00
.gitignore
Kconfig	tracing: clean up menu	2009-03-05 21:53:25 +01:00