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-27 18:03:05 -07:00
2008-09-06 12:10:45 +01:00
2010-07-16 10:57:35 +01:00
2010-10-26 16:52:08 -07:00
2010-10-18 22:34:47 +01:00
2009-03-25 13:10:01 +02:00