tmp_suning_uos_patched/arch/blackfin
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 kbuild: use KECHO convenience echo 2008-12-03 21:32:01 +01:00
configs Blackfin arch: Update CM-BF527 kernel config 2009-02-04 16:49:45 +08:00
include/asm Merge branch 'x86/core' into tracing/textedit 2009-03-06 16:45:01 +01:00
kernel Merge branch 'linus' into x86/apic 2009-02-13 09:44:22 +01:00
lib Blackfin arch: merge adeos blackfin part to arch/blackfin/ 2009-01-07 23:14:39 +08:00
mach-bf518 Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files 2009-02-04 16:49:45 +08:00
mach-bf527 Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files 2009-02-04 16:49:45 +08:00
mach-bf533 Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs 2009-02-04 16:49:45 +08:00
mach-bf537 Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files 2009-02-04 16:49:45 +08:00
mach-bf538 Blackfin arch: Fix bug - Run "reboot" hangs bf518-ezbrd 2009-02-04 16:49:45 +08:00
mach-bf548 Blackfin arch: Add ANOMALY_05000380 to BF54x to kill the compile warning 2009-02-04 16:49:45 +08:00
mach-bf561 Blackfin arch: Add BF561 PPI POLS, POLC Masks 2009-02-04 16:49:45 +08:00
mach-common Blackfin arch: fix 2 bugs related to debug 2009-02-04 16:49:45 +08:00
mm Blackfin arch: Faster C implementation of no-MPU CPLB handler 2009-01-07 23:14:38 +08:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
Kconfig Blackfin arch: add support for mobile ddr bf54x parts 2009-02-04 16:49:45 +08:00
Kconfig.debug Blackfin arch: change HWTRACE Kconfig and set it on default 2009-01-07 23:14:38 +08:00
Makefile Blackfin arch: line up machine-/cpu- vars after BF54xM addition 2009-02-04 16:49:45 +08:00