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

..

fusion

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01:00

i2o

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00