From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 3 Jul 2008 15:13:28 +0000 (+0100)
Subject: Merge branch 'fb' into devel
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=946e2ad040000a14b7316fae722e7e65fa09ffe5;p=linux-edison.git

Merge branch 'fb' into devel

Conflicts:

	arch/arm/Kconfig
---

946e2ad040000a14b7316fae722e7e65fa09ffe5