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
..
cs5536	MIPS: Loongson: Migrate makefile to new Platform file	2010-08-05 13:25:45 +01:00
bonito-irq.c
cmdline.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
early_printk.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
env.c	MIPS: Loongson: Add return value check for strict_strtoul()	2010-12-16 18:10:55 +00:00
gpio.c	MIPS: Loongson 2F: Add gpio/gpioilb support	2010-05-21 21:31:16 +01:00
init.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
irq.c	MIPS: Loongson: Remove set_irq_trigger_mode()	2010-08-05 13:26:23 +01:00
machtype.c	MIPS: Loongson: Fix typo in gdium mach type string.	2010-04-30 20:52:49 +01:00
Makefile	MIPS: Loongson: Define rtc device on MC146818-equipped systems	2010-07-05 17:17:32 +01:00
mem.c	MIPS: Loongson: Fix phys_mem_access_prot() check	2010-04-30 20:52:51 +01:00
pci.c
platform.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
pm.c	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
reset.c	MIPS: Loongson 2F: Fix of problems introduced by -mfix-loongson2f-jump	2010-04-30 20:52:58 +01:00
rtc.c	MIPS: Loongson: Define rtc device on MC146818-equipped systems	2010-07-05 17:17:32 +01:00
serial.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
setup.c	MIPS: Fixup screen_info struct initializations	2010-04-30 20:52:42 +01:00
time.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00
uart_base.c	MIPS: Loongson: Change the Email address of Wu Zhangjin	2010-02-27 12:53:12 +01:00