Merge remote-tracking branch 'pwm/for-next'

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

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

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

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

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

diff --cc include/linux/pwm.h
index 70655a205b740f20c9012d497f749fafed53e290,3fef47733ea3a4a536cb87f053dc002ca20c1c0c..a4df2042b79c15f75bf53dd8d185fd6c80426b05
--- 1/include/linux/pwm.h
--- 2/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@@ -174,14 -177,13 +177,16 @@@ struct pwm_device *pwm_request_from_chi
  struct pwm_device *of_pwm_xlate_with_flags(struct pwm_chip *pc,
                const struct of_phandle_args *args);
  
 -struct pwm_device *pwm_get(struct device *dev, const char *consumer);
 +struct pwm_device *pwm_get(struct device *dev, const char *con_id);
 +struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id);
  void pwm_put(struct pwm_device *pwm);
  
 -struct pwm_device *devm_pwm_get(struct device *dev, const char *consumer);
 +struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id);
 +struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
 +                                 const char *con_id);
  void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
+ 
+ bool pwm_can_sleep(struct pwm_device *pwm);
  #else
  static inline int pwm_set_chip_data(struct pwm_device *pwm, void *data)
  {