From: Olof Johansson <olof@lixom.net>
Date: Thu, 11 Apr 2013 10:38:03 +0000 (-0700)
Subject: Merge branch 'depends/clk-for-3.10' into next/cleanup
X-Git-Tag: v3.10-rc1~125^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83c15f4c05757b3c5fe1551a474458fd16d27bae;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'depends/clk-for-3.10' into next/cleanup

Bringin in clk subsystem dependencies needed by sunxi.

* depends/clk-for-3.10: (26 commits)
  clk: sunxi: drop an unnecesary kmalloc
  clk: sunxi: drop CLK_IGNORE_UNUSED
  clk: sunxi: Add support for AXI, AHB, APB0 and APB1 gates
  clk: divider: Introduce CLK_DIVIDER_ALLOW_ZERO flag
  clk: mvebu: Use common of_clk_init() function
  clk: fix clk_mux::flags kerneldoc
  clk: allow reentrant calls into the clk framework
  clk: abstract locking out into helper functions
  clk: zynq: Add missing zynq clk header
  clk: sunxi: rename compatible strings
  arm: sunxi: Add useful information about sunxi clocks
  clk: arm: sunxi: Add a new clock driver for sunxi SOCs
  clk: ux500: Fix prcmu clocks registration
  ARM: imx: adapt clk_busy_mux to new clk_mux struct
  clk: Add composite clock type
  clk: add table lookup to mux
  clk: Fix incorrect return type in clk.c
  clk: prima2: fix return value check in sirfsoc_of_clk_init()
  clk:SPEAr1340: Correct parent clock configuration
  documentation: clk: fix couple of misspelling
  ...
---

83c15f4c05757b3c5fe1551a474458fd16d27bae