From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 1 Jul 2011 14:17:13 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-3.1/core
X-Git-Tag: v3.1-rc1~252^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04bf7869ca0fd12009aee301cac2264a36df4d98;p=pandora-kernel.git

Merge branch 'for-linus' into for-3.1/core

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

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

04bf7869ca0fd12009aee301cac2264a36df4d98
Reading git-diff-tree failed