linux-next: manual merge of the arm tree with the arm-current tree

From: Stephen Rothwell
Date: Sun Jul 25 2010 - 21:14:06 EST

Next message: Denys Vlasenko: "Re: Testing of function/data-sections on linux-2.6.35-rc4"
Previous message: Michael Jensen: "Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-l7200/include/mach/debug-macro.S between commit
a2d7c57a2eb1d30a7fdb8df9e965dea721b75711 ("ARM: 6257/1: arm/l7200: fix
debug macro compilation failure") from the arm-current tree and commit
c9c6fe5033191d82e1d819105485c795062107fd ("ARM: Remove support for LinkUp
Systems L7200 SDP") from the arm tree.

The latter just removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Denys Vlasenko: "Re: Testing of function/data-sections on linux-2.6.35-rc4"
Previous message: Michael Jensen: "Re: [PATCH] Staging: comedi: comedidev: Removed unused macro definitions"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]