]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-3.3/core' into for-next
authorJens Axboe <axboe@kernel.dk>
Thu, 15 Dec 2011 15:07:26 +0000 (16:07 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 15 Dec 2011 15:07:26 +0000 (16:07 +0100)
commit954adda825afbbdc18e0b933a565590b21125c1b
tree2a3bf24b8d393b61794c5389aec79fde15a16017
parent629baa771f62d55223c8486bcff09813404d74e4
parentf1f8cc94651738b418ba54c039df536303b91704
Merge branch 'for-3.3/core' into for-next

Conflicts:
block/cfq-iosched.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c
block/cfq-iosched.c
include/linux/blkdev.h