Subject: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Sat, 23 Aug 2014 05:57:23 +1000

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from the
usb-gadget-fixes tree and commit 0dafc3d94596 ("usb: phy: samsung:
Remove unnecessary lines of register bit definitions") from the
usb-gadget 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/phy/phy-samsung-usb.h
index 80eedd45a20a,4eef45555971..000000000000
--- a/drivers/usb/phy/phy-samsung-usb.h
+++ b/drivers/usb/phy/phy-samsung-usb.h
@@@ -215,8 -185,7 +185,7 @@@
  #define PHYPARAM0_REF_LOSLEVEL			(0x9 << 26)
  
  #define EXYNOS5_DRD_PHYPARAM1			(0x20)
- 
 -#define PHYPARAM1_PCS_TXDEEMPH_MASK		(0x1f << 0)
 +#define PHYPARAM1_PCS_TXDEEMPH_MASK		(0x3f << 0)
  #define PHYPARAM1_PCS_TXDEEMPH			(0x1c)
  
  #define EXYNOS5_DRD_PHYTERM			(0x24)