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-09-26 18:34:29 -07:00
2010-09-06 13:32:20 -07:00
2010-09-06 13:32:20 -07:00
2010-09-26 18:34:29 -07:00
2010-11-01 15:38:34 -04:00
2010-08-10 00:06:58 -07:00
2010-05-10 05:01:31 -07:00
2010-06-03 03:18:23 -07:00
2010-09-15 22:06:05 -07:00
2010-06-03 03:18:23 -07:00
2010-09-06 13:32:20 -07:00
2010-09-26 18:34:29 -07:00
2010-09-26 18:34:29 -07:00
2010-05-10 05:01:31 -07:00
2010-09-06 13:32:20 -07:00