]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 19 Mar 2010 07:05:10 +0000 (08:05 +0100)
commitdc4cc21bfb721eee157587ab6e752f73fadafbdc
tree23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7
parenta308a96d54cd46ba6be1def87b5149696de947d0
parentaaf55587e13b383ac3f59cc5ea15f345e76d3d55
Merge branch 'master' into for-linus

Conflicts:
block/Kconfig

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
block/blk-sysfs.c
drivers/block/drbd/drbd_int.h
drivers/scsi/sd.c
fs/bio.c