From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Apr 2013 23:50:23 +0000 (-0700)
Subject: Merge tag 'extcon-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo... 
X-Git-Tag: firefly_0821_release~3680^2~676^2~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=606f34ad124faeeb77830d7fdfc513084566d2ba;p=firefly-linux-kernel-4.4.55.git

Merge tag 'extcon-for-3.10' of git://git./linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

	This is small fixes for extcon driver.

	MAX77693 extcon driver
	- Add 'static' keryword to internal data structure
	- Fix return value using 'ret' instead of hardcoding

	MAX8997 extcon driver
	- Use dev_err() instead of pr_err()
	- Fix return value using 'ret' instead of hardcoding
---

606f34ad124faeeb77830d7fdfc513084566d2ba