From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 22 Feb 2010 12:48:51 +0000 (+0100)
Subject: Merge branch 'master' into for-2.6.34
X-Git-Tag: v2.6.34-rc1~242^2~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f11cbd74c5ff3614f6390b4de67a6ffdc614c378;p=users%2Fhch%2Fblock.git

Merge branch 'master' into for-2.6.34
---

f11cbd74c5ff3614f6390b4de67a6ffdc614c378