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-07-02 13:51:11 +02:00
2010-11-01 15:38:34 -04:00
2007-12-17 19:28:17 -08:00
2010-03-07 21:19:09 +01:00
2010-03-07 21:22:56 +01:00
2010-10-28 00:32:23 +02:00
2008-07-25 22:12:41 +02:00
2009-06-09 22:37:54 +02:00
2010-03-23 12:26:38 +01:00
2010-11-18 15:00:46 -08:00
2008-04-25 20:18:48 +02:00
2010-08-17 11:47:40 +02:00
2009-06-09 22:37:54 +02:00