From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 13:24:41 +0000 (+0100)
Subject: Merge branch 'cross-platform/debug_ll' into imx/imx6q
X-Git-Tag: v3.2-rc1~88^2^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccfa8b21f20099b950b4f2f75d2330fb149a2012;p=pandora-kernel.git

Merge branch 'cross-platform/debug_ll' into imx/imx6q

Conflicts:
	arch/arm/Kconfig.debug
---

ccfa8b21f20099b950b4f2f75d2330fb149a2012
Reading git-diff-tree failed