Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ...

Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-06-01 21:06:21 +02:00

..

executive

MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon/executive and asm/octeon.

2009-01-11 09:57:20 +00:00

csrc-octeon.c

MIPS: Cavium: Add struct clocksource * argument to octeon_cvmcount_read()

2009-05-14 13:50:29 +01:00

dma-octeon.c

MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.

2009-01-11 09:57:21 +00:00

flash_setup.c

MIPS: Stop using <asm-generic/int-l64.h>.

2009-03-30 14:49:41 +02:00

Kconfig

MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.

2009-01-11 09:57:21 +00:00

Makefile

MIPS: Cavium: Add -Werror

2009-03-30 14:49:41 +02:00

octeon-irq.c

irq: change ->set_affinity() to return status

2009-04-28 12:21:16 +02:00

octeon-memcpy.S

MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.

2009-01-11 09:57:21 +00:00

serial.c

MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.

2009-01-11 09:57:21 +00:00

setup.c

MIPS: Octeon: Remove duplicated #includes

2009-01-30 21:32:57 +00:00

smp.c

MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.

2009-01-11 09:57:21 +00:00