Merge branch 'for-4.8/capture' into for-next

diff --cc drivers/pwm/core.c
Simple merge

diff --cc drivers/pwm/sysfs.c
Simple merge

diff --cc include/linux/pwm.h
index 47e66bfb8cb45d400027f50ed3cd1c5cbbb9c12a,8402b5dd3e0676e3f29f684cdc6b6716ca7f42b4..f1bbae014889b67a219a73c1e76156aa53229024
--- 1/include/linux/pwm.h
--- 2/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@@ -411,7 -335,10 +426,9 @@@ static inline void pwm_disable(struct p
        pwm_apply_state(pwm, &state);
  }
  
 -
  /* PWM provider APIs */
+ int pwm_capture(struct pwm_device *pwm, struct pwm_capture *result,
+               unsigned long timeout);
  int pwm_set_chip_data(struct pwm_device *pwm, void *data);
  void *pwm_get_chip_data(struct pwm_device *pwm);