Messages in this thread | | | Date | Mon, 7 Jun 2010 12:53:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the devicetree tree with Linus' tree |
| |
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in drivers/usb/host/ehci-hcd.c between commit 1f23b2d98c11fed43c552a5dbd00c793f81a8736 ("usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected") from the tree and commit 4c018c4ab1edd8f4154848868960ebe132c3d138 ("usb/of: fix build errors") from the devicetree tree.
They look like two version of the same fix. I used the version from Linus' tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |