From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 May 2012 18:16:53 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-renames-for-v3.5' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=011fa72ea6b59a9dde19309597ebe5eb71b8f8d7;p=pandora-kernel.git

Merge tag 'omap-cleanup-renames-for-v3.5' into tmp-merge

Simplify some SoC config options before things get too unreadable.

Note that this depends on a fix in omap-fixes-non-critical-for-v3.5,
so it's based on that.
---

011fa72ea6b59a9dde19309597ebe5eb71b8f8d7
Reading git-diff-tree failed