tree 338c6acbd1d3dcc4be9d7ded94f6096d500cbf7e
parent ef82bdc57a204bf452da9f7c273c21462f17344e
parent 00aaad227aeb30800ac85b981f3ea4e20ae9bd9e
author Linus Torvalds <torvalds@linux-foundation.org> 1317079766 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317079766 -0700

Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung

* '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