[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120925163724.703a41b9438fbaef84b7480e@canb.auug.org.au>
Date: Tue, 25 Sep 2012 16:37:24 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Tony Prisk <linux@...sktech.co.nz>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the arm-soc tree with the tree
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).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists