From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Jul 2012 01:06:49 +0000 (-0700)
Subject: Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux
X-Git-Tag: v3.5-rc6~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9e85a6f9dc231f3ed3c1dc1b12217505d970142a;p=~emulex%2Finfiniband.git

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

Pull fix to common clk framework from Michael Turquette:
 "The previous set of common clk fixes for -rc5 left an uninitialized
  int which could lead to bad array indexing when switching clock
  parents.  The issue is fixed with a trivial change to the code flow in
  __clk_set_parent."

* tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mturquette/linux:
  clk: fix parent validation in __clk_set_parent()
---

9e85a6f9dc231f3ed3c1dc1b12217505d970142a