diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 09:03:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-21 09:03:38 +0100 |
| commit | 4604096768d3be37ee1a05aee424aceed3e1b56f (patch) | |
| tree | 56010e180bb32be7e57971e4bb617c28d0d09099 /drivers/cdrom/viocd.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | [PATCH] block: document io scheduler allow_merge_fn hook (diff) | |
| download | linux-4604096768d3be37ee1a05aee424aceed3e1b56f.tar.xz linux-4604096768d3be37ee1a05aee424aceed3e1b56f.zip | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] block: document io scheduler allow_merge_fn hook
[PATCH] cfq-iosched: don't allow sync merges across queues
[PATCH] Fixup blk_rq_unmap_user() API
[PATCH] __blk_rq_unmap_user() fails to return error
[PATCH] __blk_rq_map_user() doesn't need to grab the queue_lock
[PATCH] Remove queue merging hooks
[PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests
[PATCH] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request
[PATCH] cciss: set default raid level when reading geometry fails
Diffstat (limited to 'drivers/cdrom/viocd.c')
0 files changed, 0 insertions, 0 deletions