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
..
2010-10-22 10:22:07 -07:00
2010-11-11 06:56:17 -08:00
2009-06-16 14:17:32 +10:00
2010-08-10 14:35:44 -07:00