Merge branch 'master' into for-2.6.35
authorJens Axboe <jens.axboe@oracle.com>
Thu, 29 Apr 2010 07:36:24 +0000 (09:36 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 29 Apr 2010 07:36:24 +0000 (09:36 +0200)
commit7407cf355fdf5500430be966dbbde84a27293bad
tree922861288ff38558ed721a79653f52b17b13bb95
parent6a47dc1418682c83d603b491df1d048f73aa973e
parent79dba2eaa771c3173957eccfd288e0e0d12e4d3f
Merge branch 'master' into for-2.6.35

Conflicts:
fs/block_dev.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
drivers/block/drbd/drbd_receiver.c
fs/block_dev.c
include/linux/backing-dev.h
include/linux/fs.h