From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Sat, 17 Dec 2011 22:00:49 +0000 (+0000)
Subject: Merge commit 'v3.2-rc6' into fbdev-next
X-Git-Tag: v3.3-rc1~59^2~30
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a4581b35e1bc80becf240238bc787a5ec2727db0;p=users%2Fjedix%2Flinux-maple.git

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

a4581b35e1bc80becf240238bc787a5ec2727db0