Messages in this thread | | | Date | Tue, 25 Sep 2012 16:56:03 +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 conflicts in arch/arm/mach-vt8500/bv07.c, arch/arm/mach-vt8500/devices-vt8500.c, arch/arm/mach-vt8500/devices-wm8505.c, arch/arm/mach-vt8500/devices.c, 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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |