From: Shawn Guo <shawn.guo@linaro.org>
Date: Wed, 5 Mar 2014 02:31:54 +0000 (+0800)
Subject: Merge tag 'kconfig-cleanup-for-3.15' into imx/soc
X-Git-Tag: v3.15-rc1~79^2~19^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1b2a174c33ae2bd453e40199de4f93c684500e6;p=pandora-kernel.git

Merge tag 'kconfig-cleanup-for-3.15' into imx/soc

- Remove common kconfig options required by multi-platform builds out
of individual platforms as they are redundant.
- Make SMP, CACHE_L2X0 and GPIO config options user visible on
multi-platform builds as most platforms enable these options and all
platforms can run with them enabled.
- Make multi-platform v6 default to more optimal v6k rather than v6
- Remove the last bit of mach-virt and convert it to just a kconfig
option.

Conflicts:
	arch/arm/mach-omap2/Kconfig
---

c1b2a174c33ae2bd453e40199de4f93c684500e6
Reading git-diff-tree failed