diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 13:20:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 13:20:43 -0700 |
| commit | c500ce38e52bb2f526b84f41314a9a9f83a2fdf5 (patch) | |
| tree | 242bca2c4d3dfd24a2497bba0ac9351f2066e469 /drivers/watchdog/geodewdt.c | |
| parent | 76e77daf6529381296f14628959aac127c817b26 (diff) | |
| parent | 01b2d4536f0215c6d97d77e157afee04300ffc90 (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
Diffstat (limited to 'drivers/watchdog/geodewdt.c')
0 files changed, 0 insertions, 0 deletions