Jiri Kosina fb8231a8b1 Merge branch 'master' into for-next ... Conflicts: arch/arm/mach-omap1/board-nokia770.c		2010-08-10 13:22:08 +02:00
..
dasd_3990_erp.c	Fix spelling fuction -> function in comments	2010-08-09 11:22:49 +02:00
dasd_alias.c	[S390] dasd: remove uid from devmap	2010-05-17 10:00:16 +02:00
dasd_devmap.c	[S390] add missing device put	2010-07-19 09:22:50 +02:00
dasd_diag.c	[S390] dasd: automatic recognition of read-only devices	2010-03-08 12:26:27 +01:00
dasd_diag.h
dasd_eckd.c	[S390] dasd: unit check handling during internal cio I/O	2010-05-26 23:27:09 +02:00
dasd_eckd.h	[S390] dasd: add dynamic pav toleration	2010-05-17 10:00:16 +02:00
dasd_eer.c	s390: remove WARN_ON for misc_deregister() failures	2010-08-09 20:45:06 -07:00
dasd_erp.c
dasd_fba.c	[S390] dasd: automatic recognition of read-only devices	2010-03-08 12:26:27 +01:00
dasd_fba.h
dasd_genhd.c	[S390] dasd: automatic recognition of read-only devices	2010-03-08 12:26:27 +01:00
dasd_int.h	[S390] dasd: unit check handling during internal cio I/O	2010-05-26 23:27:09 +02:00
dasd_ioctl.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dasd_proc.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dasd.c	[S390] dasd: unit check handling during internal cio I/O	2010-05-26 23:27:09 +02:00
dcssblk.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
Kconfig
Makefile
xpram.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00