From: Chris Mason <chris.mason@oracle.com>
Date: Wed, 27 Jul 2011 20:13:10 +0000 (-0400)
Subject: Merge branch 'integration' into for-linus
X-Git-Tag: v3.1-rc1~134^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=ff95acb6733d41a8d45feb0e18b96df25e610e78

Merge branch 'integration' into for-linus
---

ff95acb6733d41a8d45feb0e18b96df25e610e78