| commit | 6fae9c25134baffbeeb20031479e7ff6f6d8eec0 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jaxboe@fusionio.com> | Tue Mar 01 15:04:39 2011 -0500 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Tue Mar 01 15:04:39 2011 -0500 |
| tree | c9ab89992ce5293a43cd455a81dc8a5926a28a5e | |
| parent | c186794dbb466b45cf40f942f2d09d6d5b4b0e42 [diff] | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 [diff] |
Merge commit 'v2.6.38-rc6' into for-2.6.39/core Conflicts: block/cfq-iosched.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>