Linus Torvalds 6fd03301d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits) debugfs: use specified mode to possibly mark files read/write only debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem. xen: remove driver_data direct access of struct device from more drivers usb: gadget: at91_udc: remove driver_data direct access of struct device uml: remove driver_data direct access of struct device block/ps3: remove driver_data direct access of struct device s390: remove driver_data direct access of struct device parport: remove driver_data direct access of struct device parisc: remove driver_data direct access of struct device of_serial: remove driver_data direct access of struct device mips: remove driver_data direct access of struct device ipmi: remove driver_data direct access of struct device infiniband: ehca: remove driver_data direct access of struct device ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device hvcs: remove driver_data direct access of struct device xen block: remove driver_data direct access of struct device thermal: remove driver_data direct access of struct device scsi: remove driver_data direct access of struct device pcmcia: remove driver_data direct access of struct device PCIE: remove driver_data direct access of struct device ... Manually fix up trivial conflicts due to different direct driver_data direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}		2009-06-16 12:57:37 -07:00
..
as-iosched.c	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
blk-barrier.c	block: Use accessor functions for queue limits	2009-05-22 23:22:54 +02:00
blk-core.c	block: remove some includings of blktrace_api.h	2009-06-16 11:19:36 +02:00
blk-exec.c	block: don't set REQ_NOMERGE unnecessarily	2009-04-28 07:37:33 +02:00
blk-integrity.c	block: Do away with the notion of hardsect_size	2009-05-22 23:22:54 +02:00
blk-ioc.c	block: prevent possible io_context->refcount overflow	2009-06-10 23:07:15 +02:00
blk-map.c	block: Use accessor functions for queue limits	2009-05-22 23:22:54 +02:00
blk-merge.c	block: Use accessor functions for queue limits	2009-05-22 23:22:54 +02:00
blk-settings.c	block: Introduce helper to reset queue limits to default values	2009-06-16 08:23:52 +02:00
blk-softirq.c	generic-ipi: remove CSD_FLAG_WAIT	2009-02-25 14:13:44 +01:00
blk-sysfs.c	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
blk-tag.c	block: change the tag sync vs async restriction logic	2009-05-20 08:54:31 +02:00
blk-timeout.c	block: clean up misc stuff after block layer timeout conversion	2009-04-28 07:37:34 +02:00
blk.h	block: fix no diskstat problem	2009-05-27 14:50:02 +02:00
bsg.c	Driver Core: bsg: add nodename for bsg driver	2009-06-15 21:30:26 -07:00
cfq-iosched.c	cfq: remove extraneous '\n' in blktrace output	2009-06-16 08:21:04 +02:00
cmd-filter.c	[SCSI] Make scsi.h independent of the rest of the scsi includes	2009-03-12 12:58:13 -05:00
compat_ioctl.c	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
deadline-iosched.c	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
elevator.c	Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block	2009-06-11 11:10:35 -07:00
genhd.c	Driver Core: block: add nodename support for block drivers.	2009-06-15 21:30:25 -07:00
ioctl.c	block: Use accessor functions for queue limits	2009-05-22 23:22:54 +02:00
Kconfig	block: enable by default support for large devices and files on 32-bit archs	2009-04-28 07:37:33 +02:00
Kconfig.iosched
Makefile	tracing/blktrace: move the tracing file to kernel/trace	2009-02-09 10:51:02 +01:00
noop-iosched.c
scsi_ioctl.c	block: Use accessor functions for queue limits	2009-05-22 23:22:54 +02:00