tmp_suning_uos_patched/arch/xtensa
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
..
boot xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
configs [PATCH] xtensa: remove extra header files 2006-12-10 09:55:39 -08:00
include/asm Merge branch 'x86/core' into tracing/textedit 2009-03-06 16:45:01 +01:00
kernel Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 2009-01-07 11:56:29 -08:00
lib xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mm xtensa: use generic show_mem() 2008-07-26 12:00:10 -07:00
platforms Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 2009-01-07 11:56:29 -08:00
variants xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 2008-10-23 09:16:56 -07:00
Kconfig.debug [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1 2005-06-24 00:05:21 -07:00
Makefile xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00