android_kernel_samsung_msm8976/arch/mips
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
..
alchemy MIPS: Alchemy: In plat_time_init() t reaches -1, tested: 0 2009-02-27 17:56:34 +00:00
basler/excite
bcm47xx
boot
cavium-octeon MIPS: Octeon: Remove duplicated #includes 2009-01-30 21:32:57 +00:00
cobalt
configs MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT 2009-01-30 21:32:58 +00:00
dec
emma
fw
gt64120/wrppmc
include/asm Merge branch 'x86/core' into tracing/textedit 2009-03-06 16:45:01 +01:00
jazz cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
kernel Merge branch 'x86/urgent' into x86/pat 2009-03-01 12:47:58 +01:00
lasat
lemote/lm2e
lib MIPS: IP27: Switch from DMA_IP27 to DMA_COHERENT 2009-01-30 21:32:58 +00:00
math-emu
mipssim
mm MIPS: CVE-2009-0029: Enable syscall wrappers. 2009-02-27 17:56:35 +00:00
mti-malta irq: update all arches for new irq_desc 2009-01-12 15:27:13 -08:00
nxp cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
oprofile
pci MIPS: RC32434: Define io_map_base for PCI controller 2009-01-30 21:32:59 +00:00
pmc-sierra trivial: fix then -> than typos in comments and documentation 2009-01-06 11:28:06 +01:00
rb532 MIPS: RB532: Export rb532_gpio_set_func() 2009-01-30 21:33:01 +00:00
sgi-ip22 irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
sgi-ip27 cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
sgi-ip32
sibyte irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
sni cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30
txx9 MIPS: TXx9: Add support for TX4939 internal RTC 2009-01-30 21:32:58 +00:00
vr41xx
Kconfig MIPS: CVE-2009-0029: Enable syscall wrappers. 2009-02-27 17:56:35 +00:00
Kconfig.debug MIPS: Kconfig: Fix the arch-specific header path 2008-12-12 18:12:23 +00:00
Makefile MIPS: Alchemy: Move development board code to common subdirectory 2009-01-11 09:57:25 +00:00