1
linux/arch/mips
Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-27 17:28:43 +01:00
..
alchemy MIPS: Alchemy: In plat_time_init() t reaches -1, tested: 0 2009-02-27 17:56:34 +00:00
basler/excite platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
bcm47xx
boot
cavium-octeon MIPS: Octeon: Remove duplicated #includes 2009-01-30 21:32:57 +00:00
cobalt
configs MIPS: Mark Eins: Fix configuration. 2009-03-13 23:08:00 +01:00
dec
emma MIPS: Mark Eins: Fix configuration. 2009-03-13 23:08:00 +01:00
fw
gt64120/wrppmc
include/asm Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
jazz
kernel Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +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: VR5500: Enable prefetch 2009-03-23 23:38:04 +01:00
mti-malta irq: update all arches for new irq_desc 2009-01-12 15:27:13 -08:00
nxp
oprofile
pci MIPS: RC32434: Define io_map_base for PCI controller 2009-01-30 21:32:59 +00:00
pmc-sierra
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
sgi-ip32
sibyte irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
sni
txx9 MIPS: TXx9: Add support for TX4939 internal RTC 2009-01-30 21:32:58 +00:00
vr41xx
Kconfig MIPS: Mark Eins: Fix configuration. 2009-03-13 23:08:00 +01:00
Kconfig.debug
Makefile MIPS: Mark Eins: Fix configuration. 2009-03-13 23:08:00 +01:00