From: Florian Tobias Schandinat Date: Sun, 24 Apr 2011 13:16:41 +0000 (+0000) Subject: Merge branch 'viafb-olpc' into viafb-next X-Git-Tag: firefly_0821_release~7613^2~1354^2~6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=567b99f84ea8efe979e020bd382dd735746b526b;p=firefly-linux-kernel-4.4.55.git Merge branch 'viafb-olpc' into viafb-next --- 567b99f84ea8efe979e020bd382dd735746b526b