From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Date: Mon, 29 Aug 2011 09:14:30 +0000 (+0000)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev... 
X-Git-Tag: v3.2-rc1~120^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a7dbfdf180a656de3eb9e64614e2b991ffaa53;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/lethal/fbdev-3.x into fbdev-next

Conflicts:
	drivers/video/atmel_lcdfb.c
---

d4a7dbfdf180a656de3eb9e64614e2b991ffaa53
Reading git-diff-tree failed