Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource ...

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2011-05-14 12:06:36 +02:00

..

clocks.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

dbdma.c

MIPS: Alchemy: add sysdev for DBDMA PM.

2010-05-21 21:31:15 +01:00

dma.c

MIPS: Alchemy: Stop IRQ name sharing

2010-02-27 12:52:53 +01:00

gpiolib-au1000.c

MIPS: Alchemy: use runtime cpu detection in GPIO code.

2010-02-27 12:53:02 +01:00

irq.c

MIPS: Alchemy: Convert to new irq chip functions

2011-03-25 18:45:14 +01:00

Makefile

MIPS: Move Alchemy Makefile parts to their own Platform file.

2010-08-05 13:25:46 +01:00

pci.c

MIPS: Alchemy: rename directory

2008-10-11 16:18:50 +01:00

platform.c

MIPS: Alchemy: fix build with SERIAL_8250=n

2010-12-16 18:11:01 +00:00

power.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

prom.c

MIPS: Alchemy: Resolve prom section mismatches

2010-10-04 18:33:59 +01:00

setup.c

MIPS: Alchemy: use 36bit addresses for PCMCIA resources.

2010-02-27 12:53:43 +01:00

sleeper.S

MIPS: Alchemy: sleepcode without compile-time cputype dependencies

2010-07-05 17:17:30 +01:00

time.c

mips: convert to clocksource_register_hz/khz

2011-02-21 13:33:50 -08:00