| commit | 4c63f5646e405b5010cc9499419060bf2e838f5b | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jaxboe@fusionio.com> | Thu Mar 10 08:58:35 2011 +0100 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Thu Mar 10 08:58:35 2011 +0100 |
| tree | df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1 | |
| parent | cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 [diff] | |
| parent | 69d60eb96ae8a73cf9b79cf28051caf973006011 [diff] |
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core Conflicts: block/blk-core.c block/blk-flush.c drivers/md/raid1.c drivers/md/raid10.c drivers/md/raid5.c fs/nilfs2/btnode.c fs/nilfs2/mdt.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>