Messages in this thread | | | Date | Tue, 18 Jun 2013 16:12:39 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the usb tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/usb/phy/phy-rcar-usb.c between commit 56a9a6de2a87 ("usb: phy: rcar-usb: Fix comment w.r.t. devm_ioremap_resource") from the usb tree and commit 725bf9dcafe1 ("phy-rcar-usb: correct base address") from the arm-soc tree.
I fixed it up (The latter removed the comment corrected by the former) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |