Prev: Fondation De France Notification!!!!
Next: linux-next: manual merge of the s5p tree with Linus' tree
From: Stephen Rothwell on 12 Jul 2010 21:00
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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
 | 
Pages: 1
Prev: Fondation De France Notification!!!!
Next: linux-next: manual merge of the s5p tree with Linus' tree