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	…
db1200	…
pb1000	…
pb1100	…
pb1200	…
pb1500	…
pb1550	…
Makefile	…
bcsr.c	MIPS: Add missing #inclusions of <linux/irq.h>	2010-10-07 14:08:54 +01:00
platform.c	…
platform.h	…
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