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
..
2009-06-16 22:42:16 +01:00
2008-01-27 18:14:45 +01:00
2009-04-07 10:23:34 +01:00
2010-04-20 01:17:13 +01:00
2010-10-24 18:16:59 +02:00
2010-10-31 21:06:59 +01:00