review.tizen.org Git - kernel/kernel-generic.git/commit

author	Jens Axboe <jens.axboe@oracle.com>
	Tue, 3 Nov 2009 20:14:39 +0000 (21:14 +0100)
committer	Jens Axboe <jens.axboe@oracle.com>
	Tue, 3 Nov 2009 20:14:39 +0000 (21:14 +0100)
commit	2058297d2d045cb57138c33b87cfabcc80e65186
tree	7ccffd0e162cbd7471f643561e79f23abb989a62	tree \| snapshot
parent	150e6c67f4bf6ab51e62defc41bd19a2eefe5709	commit \| diff
parent	4b27e1bb442e964903f8a3fa6bdf33a602dc0941	commit \| diff

Merge branch 'for-linus' into for-2.6.33

Conflicts:
block/cfq-iosched.c

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

Domain: System / Uncategorized;