diff options
| author | Kishon Vijay Abraham I <[email protected]> | 2016-09-15 10:16:11 +0000 |
|---|---|---|
| committer | Kishon Vijay Abraham I <[email protected]> | 2016-09-15 11:15:20 +0000 |
| commit | cb9850d092f7d2c86662d71fbfe10685cbddda21 (patch) | |
| tree | 77023cbc002680edbe3738f87dc9be413a8b8e68 /drivers/usb/class/cdc-acm.c | |
| parent | Merge tag 'usb-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bal... (diff) | |
| parent | phy-twl4030-usb: initialize charging-related stuff via pm_runtime (diff) | |
| download | kernel-cb9850d092f7d2c86662d71fbfe10685cbddda21.tar.gz kernel-cb9850d092f7d2c86662d71fbfe10685cbddda21.zip | |
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/usb/class/cdc-acm.c')
0 files changed, 0 insertions, 0 deletions