diff options
| author | Jens Axboe <[email protected]> | 2011-03-01 20:04:39 +0000 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2011-03-01 20:04:39 +0000 |
| commit | 6fae9c25134baffbeeb20031479e7ff6f6d8eec0 (patch) | |
| tree | c9ab89992ce5293a43cd455a81dc8a5926a28a5e /fs/jbd/commit.c | |
| parent | block: share request flush fields with elevator_private (diff) | |
| parent | Linux 2.6.38-rc6 (diff) | |
| download | kernel-6fae9c25134baffbeeb20031479e7ff6f6d8eec0.tar.gz kernel-6fae9c25134baffbeeb20031479e7ff6f6d8eec0.zip | |
Merge commit 'v2.6.38-rc6' into for-2.6.39/core
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <[email protected]>
Diffstat (limited to 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions