| commit | 0eb8e885726a3a93206510092bbc7e39e272f6ef | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jaxboe@fusionio.com> | Fri May 20 20:36:16 2011 +0200 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Fri May 20 20:36:16 2011 +0200 |
| tree | d866a663df8d7d0f6a405d7eba45d889c12ba8bb | |
| parent | af75cd3c67845ebe31d2df9a780889a5ebecef11 [diff] | |
| parent | 0a58e077eb600d1efd7e54ad9926a75a39d7f8ae [diff] |
Merge branch 'for-linus' into for-2.6.40/core This patch merges in a fix that missed 2.6.39 final. Conflicts: block/blk.h