summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-17 00:20:43 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-17 00:20:43 +0400
commitc500ce38e52bb2f526b84f41314a9a9f83a2fdf5 (patch)
tree242bca2c4d3dfd24a2497bba0ac9351f2066e469 /include/linux
parent76e77daf6529381296f14628959aac127c817b26 (diff)
parent01b2d4536f0215c6d97d77e157afee04300ffc90 (diff)
downloadlinux-c500ce38e52bb2f526b84f41314a9a9f83a2fdf5.tar.xz
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
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions