Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ...

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

2010-12-22 18:57:02 +01:00

..

board-qi_lb60.c

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01:00

clock-debugfs.c

MIPS: JZ4740: Add clock API support.

2010-08-05 13:26:12 +01:00

clock.c

MIPS: JZ4740: Add clock API support.

2010-08-05 13:26:12 +01:00

clock.h

MIPS: JZ4740: Add clock API support.

2010-08-05 13:26:12 +01:00

dma.c

MIPS: JZ4740: Add DMA support.

2010-08-05 13:26:15 +01:00

gpio.c

tree-wide: fix comment/printk typos

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

irq.c

MIPS: JZ4740: Add IRQ handler code

2010-08-05 13:26:13 +01:00

irq.h

MIPS: JZ4740: Add IRQ handler code

2010-08-05 13:26:13 +01:00

Kconfig

MIPS: JZ4740: Add qi_lb60 board support

2010-08-05 13:26:20 +01:00

Makefile

MIPS: JZ4740: Add qi_lb60 board support

2010-08-05 13:26:20 +01:00

Platform

MIPS: jz4740: Fix Kbuild Platform file.

2010-10-19 18:32:39 +01:00

platform.c

MIPS: JZ4740: Fix pcm device name

2010-12-16 18:10:57 +00:00

pm.c

suspend: constify platform_suspend_ops

2010-11-16 14:14:02 +01:00

prom.c

MIPS: jz4740: Fix section mismatch in prom.c

2010-12-16 18:10:53 +00:00

pwm.c

MIPS: JZ4740: Add PWM support

2010-08-05 13:26:16 +01:00

reset.c

MIPS: JZ4740: Add power-management and system reset support

2010-08-05 13:26:14 +01:00

reset.h

MIPS: JZ4740: Add power-management and system reset support

2010-08-05 13:26:14 +01:00

serial.c

MIPS: JZ4740: Add serial support

2010-08-05 13:26:16 +01:00

serial.h

MIPS: JZ4740: Add serial support

2010-08-05 13:26:16 +01:00

setup.c

MIPS: JZ4740: Add setup code

2010-08-05 13:26:14 +01:00

time.c

MIPS: JZ4740: Add clocksource/clockevent support.

2010-08-05 13:26:14 +01:00

timer.c

MIPS: JZ4740: Add timer support

2010-08-05 13:26:13 +01:00

timer.h

MIPS: JZ4740: Add timer support

2010-08-05 13:26:13 +01:00