tree 7ccffd0e162cbd7471f643561e79f23abb989a62
parent 150e6c67f4bf6ab51e62defc41bd19a2eefe5709
parent 4b27e1bb442e964903f8a3fa6bdf33a602dc0941
author Jens Axboe <jens.axboe@oracle.com> 1257279279 +0100
committer Jens Axboe <jens.axboe@oracle.com> 1257279279 +0100

Merge branch 'for-linus' into for-2.6.33

Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>