Merge branch 'cfq-2.6.33' into for-2.6.33
commit150e6c67f4bf6ab51e62defc41bd19a2eefe5709
authorJens Axboe <jens.axboe@oracle.com>
Tue, 3 Nov 2009 20:12:10 +0000 (3 21:12 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 3 Nov 2009 20:12:10 +0000 (3 21:12 +0100)
tree586bd5450afc4f142d78017389af260e76c19f0b
parent4f570f995f68ef77aae7e5a441222f59232f2d0e
parent5869619cb5b26754574375472fe54a390edf34c7
Merge branch 'cfq-2.6.33' into for-2.6.33
block/cfq-iosched.c