| commit | cb9850d092f7d2c86662d71fbfe10685cbddda21 | |
| author | Kishon Vijay Abraham I <kishon@ti.com> | |
| Thu, 15 Sep 2016 10:16:11 +0000 (15 15:46 +0530) | ||
| committer | Kishon Vijay Abraham I <kishon@ti.com> | |
| Thu, 15 Sep 2016 11:15:20 +0000 (15 16:45 +0530) | ||
| tree | 77023cbc002680edbe3738f87dc9be413a8b8e68 | treesnapshot (tar.gz zip) |
| parent | 81522637485dd6ec9de4279c9714d58f884b6091 | commitdiff |
| parent | b78ea84a7d45b9e5ad2eee429a2140065a39d755 | commitdiff |
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
Conflicts:
drivers/extcon/extcon-adc-jack.c
drivers/extcon/extcon-arizona.c
drivers/extcon/extcon-gpio.c
include/linux/extcon.h
| drivers/extcon/extcon-gpio.c | diff1 | diff2 | blobhistory |
| include/linux/extcon.h | diff1 | diff2 | blobhistory |