Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: kill swap_io_context() as-iosched: fix inconsistent ioc->lock context ide-cd: fix leftover data BUG block: make elevator lib checkpatch compliant cfq-iosched: make checkpatch compliant block: make core bits checkpatch compliant block: new end request handling interface should take unsigned byte counts unexport add_disk_randomness block/sunvdc.c:print_version() must be __devinit splice: always updated atime in direct splice
Showing
- block/as-iosched.c 6 additions, 18 deletionsblock/as-iosched.c
- block/blk-barrier.c 2 additions, 3 deletionsblock/blk-barrier.c
- block/blk-core.c 81 additions, 88 deletionsblock/blk-core.c
- block/blk-exec.c 0 additions, 1 deletionblock/blk-exec.c
- block/blk-ioc.c 0 additions, 9 deletionsblock/blk-ioc.c
- block/blk-map.c 4 additions, 6 deletionsblock/blk-map.c
- block/blk-merge.c 6 additions, 6 deletionsblock/blk-merge.c
- block/blk-settings.c 27 additions, 34 deletionsblock/blk-settings.c
- block/blk-sysfs.c 3 additions, 2 deletionsblock/blk-sysfs.c
- block/blk-tag.c 3 additions, 9 deletionsblock/blk-tag.c
- block/cfq-iosched.c 46 additions, 37 deletionsblock/cfq-iosched.c
- block/elevator.c 30 additions, 27 deletionsblock/elevator.c
- drivers/block/sunvdc.c 1 addition, 1 deletiondrivers/block/sunvdc.c
- drivers/char/random.c 0 additions, 2 deletionsdrivers/char/random.c
- drivers/ide/ide-cd.c 1 addition, 1 deletiondrivers/ide/ide-cd.c
- fs/splice.c 1 addition, 3 deletionsfs/splice.c
- include/linux/blkdev.h 9 additions, 7 deletionsinclude/linux/blkdev.h
Loading
Please register or sign in to comment