| commit | fa251f89903d73989e2f63e13d0eaed1e07ce0da | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jaxboe@fusionio.com> | Tue Oct 19 09:13:04 2010 +0200 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Tue Oct 19 09:13:04 2010 +0200 |
| tree | 3f7fe779941e3b6d67754dd7c44a32f48ea47c74 | |
| parent | dd3932eddf428571762596e17b65f5dc92ca361b [diff] | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 [diff] |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier Conflicts: block/blk-core.c drivers/block/loop.c mm/swapfile.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>