Merge branch 'v2.6.37-rc2' into for-2.6.38/core

author Jens Axboe <[email protected]>

Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)

committer Jens Axboe <[email protected]>

Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
author Jens Axboe <[email protected]>
Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
committer Jens Axboe <[email protected]>
Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
diff --cc block/cfq-iosched.c
Simple merge
diff --cc fs/partitions/check.c
Simple merge
author	Jens Axboe <[email protected]>
	Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
committer	Jens Axboe <[email protected]>
	Tue, 16 Nov 2010 09:09:42 +0000 (10:09 +0100)
		1	2
block/cfq-iosched.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/partitions/check.c	patch \|	diff1 \|	diff2 \|	blob \| history