]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' into for-3.1/core
authorJens Axboe <jaxboe@fusionio.com>
Fri, 1 Jul 2011 14:17:13 +0000 (16:17 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Fri, 1 Jul 2011 14:17:13 +0000 (16:17 +0200)
commitcc1d0a802dfdc128cdd33f8f3d60dd3b161b78c7
tree66cb81ebf8b76560a31433c2c493dc430c914af9
parent86725e6892e914794385f25cb3875f6fd1093587
parent45facd3eaab1191afba99008b815e8f0aa494717
Merge branch 'for-linus' into for-3.1/core

Conflicts:
block/blk-throttle.c
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
block/blk-ioc.c
block/cfq-iosched.c
block/genhd.c
fs/partitions/check.c
include/linux/blkdev.h