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-08-14 22:26:53 +02:00
2010-05-10 13:37:16 -07:00
2010-04-08 11:34:34 +02:00
2010-10-27 14:30:01 +02:00
2010-11-26 15:00:58 +01:00