| commit | 7407cf355fdf5500430be966dbbde84a27293bad | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jens.axboe@oracle.com> | Thu Apr 29 09:36:24 2010 +0200 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Thu Apr 29 09:36:24 2010 +0200 |
| tree | 922861288ff38558ed721a79653f52b17b13bb95 | |
| parent | 6a47dc1418682c83d603b491df1d048f73aa973e [diff] | |
| parent | 79dba2eaa771c3173957eccfd288e0e0d12e4d3f [diff] |
Merge branch 'master' into for-2.6.35 Conflicts: fs/block_dev.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>