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
..
2005-04-16 15:20:36 -07:00
2006-04-13 10:13:26 -05:00
2007-02-17 19:20:16 +01:00
2007-10-19 23:22:55 +02:00
2010-12-22 18:57:02 +01:00
2009-04-03 10:23:16 -05:00
2009-04-03 10:23:16 -05:00