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-25 13:09:44 -07:00
2010-10-25 13:09:43 -07:00
2010-11-12 14:07:14 -08:00
2010-12-22 18:57:02 +01:00
2010-12-22 18:57:02 +01:00
2010-09-23 14:33:39 -07:00
2010-12-22 18:57:02 +01:00
2010-12-22 18:57:02 +01:00
2010-10-21 15:44:13 +02:00
2010-09-23 14:33:39 -07:00
2010-12-08 12:13:43 -08:00
2010-12-08 09:58:44 -08:00
2010-04-20 16:37:13 -07:00
2010-12-22 18:57:02 +01:00
2010-11-29 09:45:15 -08:00
2010-08-09 11:25:17 +02:00
2010-12-09 20:35:27 -08:00
2010-10-15 15:53:27 +02:00