]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76e77da 01b2d45)
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)
commitc500ce38e52bb2f526b84f41314a9a9f83a2fdf5
tree242bca2c4d3dfd24a2497bba0ac9351f2066e469tree | snapshot
parent76e77daf6529381296f14628959aac127c817b26commit | diff
parent01b2d4536f0215c6d97d77e157afee04300ffc90commit | 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 for KaRo TX COM modules