Merge "usb: pd: Support Android dual_role_usb sysfs class"

author Linux Build Service Account <lnxbuild@localhost>

Sun, 27 Nov 2016 05:27:45 +0000 (21:27 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Sun, 27 Nov 2016 05:27:45 +0000 (21:27 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Sun, 27 Nov 2016 05:27:45 +0000 (21:27 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sun, 27 Nov 2016 05:27:45 +0000 (21:27 -0800)
diff --cc drivers/usb/pd/policy_engine.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sun, 27 Nov 2016 05:27:45 +0000 (21:27 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sun, 27 Nov 2016 05:27:45 +0000 (21:27 -0800)