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-09-16 10:33:07 +02:00
2008-10-17 14:40:53 -07:00
2010-10-12 16:39:07 +02:00
2010-10-29 13:14:39 -05:00
2007-05-08 11:15:15 -07:00
2008-02-07 08:42:16 -08:00
2008-10-30 11:38:47 -07:00
2007-05-22 23:45:48 -07:00