linux-next: manual merge of the usb tree with the tree

From: Stephen Rothwell
Date: Mon Oct 28 2013 - 08:02:13 EST

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/Kconfig between commit 12cc4b3827f8 ("PowerCap: Add to drivers
Kconfig and Makefile") from the pm tree and commit ff764963479a
("drivers: phy: add generic PHY framework") from the usb tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/Kconfig
index 969e9871785c,8f451449abd3..000000000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -166,6 -166,6 +166,8 @@@ source "drivers/reset/Kconfig

source "drivers/fmc/Kconfig"

+source "drivers/powercap/Kconfig"
+ source "drivers/phy/Kconfig"

Attachment: pgp00000.pgp
Description: PGP signature