lkml.org 
[lkml]   [2012]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the arm-soc tree with the tree
Date
On Tue, 2012-09-25 at 16:37 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> Documentation/devicetree/bindings/usb/platform-uhci.txt between commit
> 100d45970327 ("ARM: vt8500: Add support for UHCI companion controller")
> from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device
> tree bindings for arch-vt8500 devices") from the arm-soc tree.
>
> I used the version from the arm-soc tree and can carry the fix as
> necessary (no action is required).
>

Both versions were the same (my bad for not removing it from the arm-soc
patch).
Thanks Stephen

Regards

Tony P
\
 
 \ /
  Last update: 2012-09-25 09:41    [W:0.043 / U:1.468 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site