Messages in this thread |  | | | Date | Tue, 13 Jul 2010 10:51:30 +1000 | | From | Stephen Rothwell <> | | Subject | linux-next: manual merge of the arm tree with Linus' tree |
| |
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in arch/arm/configs/lusl7200_defconfig between commit 07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from Linus' tree and commit c9c6fe5033191d82e1d819105485c795062107fd ("ARM: Remove support for LinkUp Systems L7200 SDP") from the arm tree.
The latter removes the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] |  |