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
..
Kconfig	…
Makefile	…
Platform	MIPS: jz4740: Fix Kbuild Platform file.	2010-10-19 18:32:39 +01:00
board-qi_lb60.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
clock-debugfs.c	…
clock.c	…
clock.h	…
dma.c	…
gpio.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
irq.c	…
irq.h	…
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	…
reset.c	…
reset.h	…
serial.c	…
serial.h	…
setup.c	…
time.c	…
timer.c	…
timer.h	…