Merge branch 'v2.6.37-rc2' into for-2.6.38/core
authorJens Axboe <jaxboe@fusionio.com>
Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
1  2 
block/cfq-iosched.c
fs/partitions/check.c

Simple merge
Simple merge