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