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-11-18 14:10:56 -08:00
2010-10-29 04:16:31 -04:00
2009-10-28 23:05:57 -07:00
2010-10-25 21:18:20 -04:00
2010-10-25 21:18:20 -04:00
2010-09-08 14:25:53 +08:00
2010-09-10 09:18:15 -07:00
2009-04-03 11:39:16 -07:00
2010-09-10 09:18:15 -07:00
2010-10-25 21:18:20 -04:00
2010-11-01 15:38:34 -04:00
2010-09-10 09:18:15 -07:00
2009-10-28 23:05:57 -07:00
2008-10-13 13:57:57 -07:00
2010-05-05 18:17:30 -07:00
2010-10-25 21:26:11 -04:00
2010-11-18 14:10:56 -08:00
2010-11-01 15:38:34 -04:00
2010-05-21 18:31:20 -04:00