diff options
| author | Jens Axboe | 2011-05-20 20:36:16 +0200 |
|---|---|---|
| committer | Jens Axboe | 2011-05-20 20:36:16 +0200 |
| commit | 0eb8e885726a3a93206510092bbc7e39e272f6ef (patch) | |
| tree | d866a663df8d7d0f6a405d7eba45d889c12ba8bb /block/blk-merge.c | |
| 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
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions