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
..
db1x00	MIPS: Ritually kill stupid printk.	2010-08-05 13:26:27 +01:00
db1200	ASoC: fix au1x platform	2010-08-31 13:06:31 +01:00
pb1000	MIPS: Ritually kill stupid printk.	2010-08-05 13:26:27 +01:00
pb1100	MIPS: Alchemy: Fix up residual devboard poweroff/reboot code.	2010-05-21 21:31:15 +01:00
pb1200	MIPS: Move Alchemy Makefile parts to their own Platform file.	2010-08-05 13:25:46 +01:00
pb1500	MIPS: Alchemy: Fix up residual devboard poweroff/reboot code.	2010-05-21 21:31:15 +01:00
pb1550	MIPS: Alchemy: Fix up residual devboard poweroff/reboot code.	2010-05-21 21:31:15 +01:00
bcsr.c	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
Makefile	MIPS: Move Alchemy Makefile parts to their own Platform file.	2010-08-05 13:25:46 +01:00
platform.c	MIPS: Alchemy: use 36bit addresses for PCMCIA resources.	2010-02-27 12:53:43 +01:00
platform.h	MIPS: Alchemy: use 36bit addresses for PCMCIA resources.	2010-02-27 12:53:43 +01:00
pm.c	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
prom.c	MIPS: Alchemy: Add return value check for strict_strtoul()	2010-12-16 18:10:55 +00:00