diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2016-09-15 15:46:11 +0530 |
|---|---|---|
| committer | Kishon Vijay Abraham I <kishon@ti.com> | 2016-09-15 16:45:20 +0530 |
| commit | cb9850d092f7d2c86662d71fbfe10685cbddda21 (patch) | |
| tree | 77023cbc002680edbe3738f87dc9be413a8b8e68 /drivers/devfreq | |
| parent | 81522637485dd6ec9de4279c9714d58f884b6091 (diff) | |
| parent | b78ea84a7d45b9e5ad2eee429a2140065a39d755 (diff) | |
Merge branch 'next' into resolution
Conflicts:
drivers/extcon/extcon-adc-jack.c
drivers/extcon/extcon-arizona.c
drivers/extcon/extcon-gpio.c
include/linux/extcon.h
Diffstat (limited to 'drivers/devfreq')
0 files changed, 0 insertions, 0 deletions