Merge branch 'for-4.7/pwm-atomic' into for-next
authorThierry Reding <thierry.reding@gmail.com>
Tue, 17 May 2016 12:57:58 +0000 (14:57 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Tue, 17 May 2016 12:57:58 +0000 (14:57 +0200)
1  2 
drivers/pwm/core.c

Simple merge