Merge tag 'omap-cleanup-renames-for-v3.5' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 18:16:53 +0000 (11:16 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 18:16:53 +0000 (11:16 -0700)
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.


Trivial merge