From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Nov 2012 15:19:45 +0000 (-0800)
Subject: Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
X-Git-Tag: v3.7-rc6~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e057aad191ce1a1ebd452877fd9d540e6bd64c6e;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux

Pull another clk layer fix from Michael Turquette:
 "GCC 4.7 users get compilation errors from unnecessary use of inline in
  clk-provider.h.  This pull request fixes the regression by removing
  inline usage from those function declarations."

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: remove inline usage from clk-provider.h
---

e057aad191ce1a1ebd452877fd9d540e6bd64c6e