From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Sep 2012 20:20:43 +0000 (-0700)
Subject: Merge tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm
X-Git-Tag: v3.6-rc6~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c500ce38e52bb2f526b84f41314a9a9f83a2fdf5;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm

Pull pwm fixes from Thierry Reding:
 "While this comes a bit later than I had wished, both patches are
  rather minor and touch only new drivers so I think these are still
  safe for merging."

* tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm:
  pwm: pwm-tiehrpwm: Fix conflicting channel period setting
  pwm: pwm-tiecap: Disable APWM mode after configure
---

c500ce38e52bb2f526b84f41314a9a9f83a2fdf5