From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Sun, 24 Apr 2011 13:16:41 +0000 (+0000)
Subject: Merge branch 'viafb-olpc' into viafb-next
X-Git-Tag: v3.0-rc1~364^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=567b99f84ea8efe979e020bd382dd735746b526b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'viafb-olpc' into viafb-next
---

567b99f84ea8efe979e020bd382dd735746b526b