| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 | |
| author | Jens Axboe <jens.axboe@oracle.com> | |
| Tue, 13 Apr 2010 18:03:21 +0000 (13 20:03 +0200) | ||
| committer | Jens Axboe <jens.axboe@oracle.com> | |
| Tue, 13 Apr 2010 18:03:21 +0000 (13 20:03 +0200) | ||
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 | treesnapshot (tar.gz zip) |
| parent | a11cdaa7af56423a921a8bdad8f5a5f4ddca918a | commitdiff |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 | commitdiff |
Merge branch 'master' into for-2.6.35
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| block/blk-cgroup.c | diff1 | diff2 | blobhistory |
| block/cfq-iosched.c | diff1 | diff2 | blobhistory |