diff options
author | Jens Axboe <axboe@kernel.dk> | 2012-05-01 12:29:55 (GMT) |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-05-01 12:29:55 (GMT) |
commit | 0b7877d4eea3f93e3dd941999522bbd8c538cb53 (patch) | |
tree | ade6d4e411b9b9b569c802e3b2179826162c934c /fs/bio.c | |
parent | bd1a68b59c8e3bce45fb76632c64e1e063c3962d (diff) | |
parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
download | linux-fsl-qoriq-0b7877d4eea3f93e3dd941999522bbd8c538cb53.tar.xz |
Merge tag 'v3.4-rc5' into for-3.5/core
The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.
Linux 3.4-rc5
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/bio.c')
0 files changed, 0 insertions, 0 deletions