Merge tag 'pull_req_20121122' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx...

MyungJoo writes:
 "extcon pull request targetting Linux 3.8 for Greg KH on 2012.11.22
  This is based on Linux 3.7 rc6"

diff --cc drivers/extcon/extcon-arizona.c
Simple merge

diff --cc drivers/extcon/extcon-max77693.c
Simple merge

diff --cc drivers/extcon/extcon-max8997.c
Simple merge