From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 May 2013 16:57:04 +0000 (-0700)
Subject: Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha... 
X-Git-Tag: v3.12-rc1~944
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a49fe6d59aae7f7835288df508b709ed2d69cbab;p=kernel%2Fkernel-generic.git

Merge branch 'topic/omap3isp' of git://git./linux/kernel/git/mchehab/linux-media

Pull omap3isp clk support from Mauro Carvalho Chehab:
 "This patch were sent in separate as it depends on a merge from clock
  framework, that you merged in commit 362ed48dee50"

* 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] omap3isp: Use the common clock framework
---

a49fe6d59aae7f7835288df508b709ed2d69cbab