| commit | 2058297d2d045cb57138c33b87cfabcc80e65186 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jens.axboe@oracle.com> | Tue Nov 03 21:14:39 2009 +0100 |
| committer | Jens Axboe <jens.axboe@oracle.com> | Tue Nov 03 21:14:39 2009 +0100 |
| tree | 7ccffd0e162cbd7471f643561e79f23abb989a62 | |
| parent | 150e6c67f4bf6ab51e62defc41bd19a2eefe5709 [diff] | |
| parent | 4b27e1bb442e964903f8a3fa6bdf33a602dc0941 [diff] |
Merge branch 'for-linus' into for-2.6.33 Conflicts: block/cfq-iosched.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>