From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Mon, 21 Nov 2011 23:42:06 +0000 (+0000)
Subject: Merge commit 'v3.2-rc2' into fbdev-next
X-Git-Tag: v3.3-rc1~59^2~61
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=300e812db26f4aa022e346f5fb9af1af134d98d8;p=users%2Fjedix%2Flinux-maple.git

Merge commit 'v3.2-rc2' into fbdev-next
---

300e812db26f4aa022e346f5fb9af1af134d98d8