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
..
Makefile
pm8001_chips.h
pm8001_ctl.c
pm8001_ctl.h
pm8001_defs.h
pm8001_hwi.c	[SCSI] pm8001: handle allocation failures	2010-09-09 15:31:54 -05:00
pm8001_hwi.h
pm8001_init.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
pm8001_sas.c
pm8001_sas.h	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00