tree c9ab89992ce5293a43cd455a81dc8a5926a28a5e
parent c186794dbb466b45cf40f942f2d09d6d5b4b0e42
parent f5412be599602124d2bdd49947b231dd77c0bf99
author Jens Axboe <jaxboe@fusionio.com> 1299009879 -0500
committer Jens Axboe <jaxboe@fusionio.com> 1299009879 -0500

Merge commit 'v2.6.38-rc6' into for-2.6.39/core

Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>