From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Sun, 8 Jul 2012 14:00:47 +0000 (+0000)
Subject: Merge branch 'fbdev-for-linus' into fbdev-next
X-Git-Tag: v3.6-rc1~16^2~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d65c8f312c7a7e0b14db8f361cc692a263025bf5;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'fbdev-for-linus' into fbdev-next
---

d65c8f312c7a7e0b14db8f361cc692a263025bf5