From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 20 May 2011 18:36:16 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-2.6.40/core
X-Git-Tag: v3.0-rc1~163^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eb8e885726a3a93206510092bbc7e39e272f6ef;p=pandora-kernel.git

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

This patch merges in a fix that missed 2.6.39 final.

Conflicts:
	block/blk.h
---

0eb8e885726a3a93206510092bbc7e39e272f6ef
Reading git-diff-tree failed