From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 16 Mar 2009 22:28:04 +0000 (+0000)
Subject: Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async... 
X-Git-Tag: v2.6.30-rc1~636^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3879f5d6f03b66626af014cbb6071ad4d79b1c42;p=pandora-kernel.git

Merge branch 'imx-fb-fix' of git://git./linux/kernel/git/djbw/async_tx into devel

Conflicts:

	drivers/video/mx3fb.c
---

3879f5d6f03b66626af014cbb6071ad4d79b1c42
Reading git-diff-tree failed