tree 922861288ff38558ed721a79653f52b17b13bb95
parent 6a47dc1418682c83d603b491df1d048f73aa973e
parent 79dba2eaa771c3173957eccfd288e0e0d12e4d3f
author Jens Axboe <jens.axboe@oracle.com> 1272526584 +0200
committer Jens Axboe <jens.axboe@oracle.com> 1272526584 +0200

Merge branch 'master' into for-2.6.35

Conflicts:
	fs/block_dev.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>