mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 19:31:53 +00:00
698567f3fa
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> |
||
|---|---|---|
| .. | ||
| cdrom.c | ||
| gdrom.c | ||
| Makefile | ||
| viocd.c | ||