linux-next: please update the i.MX tree
From: Stephen Rothwell <hidden>
Date: 2012-01-10 00:52:32
Also in:
linux-arm-kernel, lkml
Hi Sascha, It looks like most (if not all) of the i.MX tree has been merged into the arm-soc (and Linus') tree, so could you please update the i.MX tree to eliminate the conflicts I am getting. CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
Attachments
- (unnamed) [application/pgp-signature] 836 bytes