From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 13 Apr 2010 18:03:21 +0000 (+0200)
Subject: Merge branch 'master' into for-2.6.35
X-Git-Tag: v2.6.35-rc1~442^2~77
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4facdaec1ce186e731e6baa04f074804849e9a49;p=pandora-kernel.git

Merge branch 'master' into for-2.6.35

Conflicts:
	block/blk-cgroup.c
	block/cfq-iosched.c

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

4facdaec1ce186e731e6baa04f074804849e9a49
Reading git-diff-tree failed