Subject: linux-next: manual merge of the usb tree with the driver-core tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Nov 2014 17:32:46 +1100

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb:
chipidea: drop owner assignment from platform_drivers") from the
driver-core tree and commit 8076932ff2fc ("usb: chipidea: add system
power management support") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/usb/chipidea/core.c
index 947ed6e78be2,e14eafb2a05e..000000000000
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@@ -751,6 -867,8 +867,7 @@@ static struct platform_driver ci_hdrc_d
  	.remove	= ci_hdrc_remove,
  	.driver	= {
  		.name	= "ci_hdrc",
+ 		.pm	= &ci_pm_ops,
 -		.owner	= THIS_MODULE,
  	},
  };