]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' into for-2.6.34
authorJens Axboe <jens.axboe@oracle.com>
Thu, 25 Feb 2010 07:48:05 +0000 (08:48 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 25 Feb 2010 07:48:05 +0000 (08:48 +0100)
commit40290b244f89a4f080201ccda08651a48783c1ad
tree5c32738f0348449c2fa9688d52e6ecf4445d76f0
parent94028b2b0d017573ab662ff5c1842cd4ceb4e1f2
parent906aed9f194f3ac700c47a1b78a087bb0999e971
Merge branch 'master' into for-2.6.34

Conflicts:
include/linux/blkdev.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-core.c
include/linux/blkdev.h