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
..
2008-01-11 18:22:30 -06:00
2009-04-03 09:23:11 -05:00
2007-05-09 08:58:15 +02:00
2007-10-20 02:13:26 +02:00
2006-10-03 22:46:31 +02:00
2006-11-30 05:21:10 +01:00
2006-11-30 04:55:36 +01:00
2006-11-30 05:21:10 +01:00