Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Sep 2011 23:29:26 +0000 (16:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Sep 2011 23:29:26 +0000 (16:29 -0700)
* 'samsung-fixes-3' of git://github.com/kgene/linux-samsung:
  ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver
  ARM: S5PV210: Rename sclk_cam clocks for FIMC media driver
  ARM: S5P: fix incorrect loop iterator usage on gpio-interrupt
  ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv


Trivial merge