From: Grant Likely <grant.likely@secretlab.ca>
Date: Mon, 24 Oct 2011 15:03:35 +0000 (+0200)
Subject: Merge commit 'v3.1' into devicetree/next
X-Git-Tag: v3.2-rc1~150^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9;p=users%2Fdwmw2%2Flinux.git

Merge commit 'v3.1' into devicetree/next
---

2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9