This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.

Jens Axboe 698567f3fa Merge commit 'v2.6.39' into for-2.6.40/core ... Since for-2.6.40/core was forked off the 2.6.39 devel tree, we've had churn in the core area that makes it difficult to handle patches for eg cfq or blk-throttle. Instead of requiring that they be based in older versions with bugs that have been fixed later in the rc cycle, merge in 2.6.39 final. Also fixes up conflicts in the below files. Conflicts: drivers/block/paride/pcd.c drivers/cdrom/viocd.c drivers/ide/ide-cd.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>		2011-05-20 20:33:15 +02:00
..
Makefile	cdrom: Add support for Sega Dreamcast GD-ROM.	2008-01-28 13:19:04 +09:00
cdrom.c	cdrom: always check_disk_change() on open	2011-04-29 10:17:25 +02:00
gdrom.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00
viocd.c	block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers	2011-04-21 21:33:05 +02:00