Merge tag 'extcon-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Apr 2013 23:50:23 +0000 (16:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Apr 2013 23:50:23 +0000 (16:50 -0700)
commit606f34ad124faeeb77830d7fdfc513084566d2ba
tree34bed5fdcd7ae909540a345070e14bcb2b981160
parent30e53bb8ffb1f3270ad89196d9799057008d9537
parent3ad9e86d54ed2770aa693a90a0872cbe7ffc6831
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