linux-next: manual merge of the arm-soc tree with the usb tree
sfr at canb.auug.org.au
Tue Sep 25 02:56:03 EDT 2012
Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-vt8500/devices.h and arch/arm/mach-vt8500/wm8505_7in.c
between commit 100d45970327 ("ARM: vt8500: Add support for UHCI companion
controller") from the usb tree and commit e9a91de7602a ("arm: vt8500: Update
arch-vt8500 to devicetree support") from the arm-soc tree.
I just removed the files and can carry the fix as necessary (there may be
more work required).
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 836 bytes
Desc: not available
More information about the linux-arm-kernel