From: Greg Kroah-Hartman Date: Wed, 19 Mar 2014 17:05:27 +0000 (-0700) Subject: Merge tag 'extcon-next-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v3.15-rc1~141^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1b3fa22e0234d613df967445cd34807e10fa54fa;p=linux-2.6-block.git Merge tag 'extcon-next-for-3.15' of git://git./linux/kernel/git/chanwoo/extcon into char-misc-next Chanwoo writes: Update extcon for v3.15 This patchset fix minor issue. The extcon-palmas/gpio use SIMPLE_DEV_PM_OPS macro instead of legacy method. OF helper function of extcon move in extcon core to remove separate of_extcon.c and change the name of OF helper function as following because previous function name is complicated and ambiguous naming. - of_extcon_get_extcon_dev() -> extcon_get_edev_by_phandle() --- 1b3fa22e0234d613df967445cd34807e10fa54fa