From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 3 Nov 2009 20:14:39 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-2.6.33
X-Git-Tag: v2.6.33-rc1~379^2~75
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2058297d2d045cb57138c33b87cfabcc80e65186;p=pandora-kernel.git

Merge branch 'for-linus' into for-2.6.33

Conflicts:
	block/cfq-iosched.c

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

2058297d2d045cb57138c33b87cfabcc80e65186
Reading git-diff-tree failed