]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73d1cf9 f0ac0e9)
Merge tag 'for-3.6-rc6' of git://gitorious.org/linux-pwm/linux-pwm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Sep 2012 20:20:43 +0000 (13:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Sep 2012 20:20:43 +0000 (13:20 -0700)
commitfbeba924588c1f35042f08655cf3841243533540
tree242bca2c4d3dfd24a2497bba0ac9351f2066e469tree | snapshot
parent73d1cf92b516a2e54f0ea0864abd1a28cf7cbcb5commit | diff
parentf0ac0e9c61dbb47bfb7f4206863b548eb1c398c9commit | diff
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
Linux Kernel Source Tree.