Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
commit18974369cfe23acf16d0fb79e0d1fba7a9a95ec0
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Oct 2011 06:41:50 +0000 (27 08:41 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Oct 2011 06:41:50 +0000 (27 08:41 +0200)
tree22367984dbd4c79e9635035e268c428444c40e76
parent7e0a6fd5a4723c79cc46c9541e343092302e0e5b
parent196a57c2749119be4732cc2b2adb8aafcb4fcb14
Merge branch 'clk' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7131/1: clkdev: Add Common Macro for clk_lookup
  clk: spi-pl022: convert to clk_prepare()/clk_unprepare()
  clk: timer-sp: convert to clk_prepare()/clk_unprepare()
  clk: sa1111: convert to clk_prepare()/clk_unprepare()
  clk: mmci: convert to clk_prepare()/clk_unprepare()
  clk: amba-pl011: convert to clk_prepare()/clk_unprepare()
  clk: amba-pl010: convert to clk_prepare()/clk_unprepare()
  clk: amba-clcd: convert to clk_prepare()/clk_unprepare()
  clk: amba bus: convert to clk_prepare()/clk_unprepare()
  clk: provide prepare/unprepare functions