From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Sep 2015 19:25:42 +0000 (-0700)
Subject: Merge tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2e5735f4c377377cb738270024083f74ee058877;p=deliverable%2Flinux.git

Merge tag 'for-v4.3-rc' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:
 "twl4030-charger fixes"

* tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  twl4030_charger: fix another compile error
  Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
---

2e5735f4c377377cb738270024083f74ee058877