summaryrefslogtreecommitdiffstats
path: root/arch/tile/kvm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-07-06 00:58:43 -0700
committerTony Lindgren <tony@atomide.com>2012-07-06 00:58:43 -0700
commit68c9a95e9253ce1776bd21bf8d37ddf213cced66 (patch)
tree286f516466c6c4ceaa404dfb97edbd4a393451f9 /arch/tile/kvm
parentecc46cfdad7499a21296f0757059c4965f1fbc98 (diff)
downloadblackbird-op-linux-68c9a95e9253ce1776bd21bf8d37ddf213cced66.tar.gz
blackbird-op-linux-68c9a95e9253ce1776bd21bf8d37ddf213cced66.zip
ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
Commit ac5b0ea3d (Merge tag 'omap-devel-f-for-3.6'...) had a merge conflict that somehow got incorrecly resolved in a lossy way for commit bed9d1bb (ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API). Fix the issue by applying the missing pieces. Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/tile/kvm')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud