| commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Wed Oct 19 14:30:42 2011 +0200 |
| committer | Jens Axboe <axboe@kernel.dk> | Wed Oct 19 14:30:42 2011 +0200 |
| tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 | |
| parent | 499337bb6511e665a236a6a947f819d98ea340c6 [diff] | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 [diff] |
Merge branch 'v3.1-rc10' into for-3.2/core Conflicts: block/blk-core.c include/linux/blkdev.h Signed-off-by: Jens Axboe <axboe@kernel.dk>