commit | c4b0bf82f705747ed7de90c5736b07248cbb29cd | [log] [tgz] |
---|---|---|
author | Kishon Vijay Abraham I <kishon@ti.com> | Thu Sep 15 15:46:11 2016 +0530 |
committer | Kishon Vijay Abraham I <kishon@ti.com> | Fri Sep 16 10:18:43 2016 +0530 |
tree | 3b4f4ee7ed31a0372c225cb03dd3ea45a736dc46 | |
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