Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Nov 2012 15:19:45 +0000 (07:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Nov 2012 15:19:45 +0000 (07:19 -0800)
commite057aad191ce1a1ebd452877fd9d540e6bd64c6e
tree7d05c37197fb968821dbdae9984837b41cb21a8d
parentc5e35d6c512c43105883043dd62cf7257ec3f9f0
parent93532c8a4890871aa0d84dd91b80dad9f58542e0
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