linux/drivers/s390
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
..
block BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
char BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
cio [S390] css: fix rsid evaluation for 2nd crw 2010-12-01 10:08:17 +01:00
crypto BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
kvm [S390] cleanup lowcore access from external interrupts 2010-10-25 16:10:19 +02:00
net Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
scsi Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
Makefile [S390] split/move machine check handler code 2009-03-26 15:24:10 +01:00