[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-parisc
Subject:    linux-next: manual merge of the parisc tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2008-09-11 20:07:49
Message-ID: 20080912060749.9abe535b.sfr () canb ! auug ! org ! au
[Download RAW message or body]

Hi Kyle,

Today's linux-next merge of the parisc tree got a conflict in
include/asm-parisc/a.out.h between commit
9d5a9e74655b9d04d0ec9c8e47801163b7b74211 ("Remove asm/a.out.h files for
all architectures without a.out support") from the dwmw2 tree and commit
aa12a68bd7340733a06a2ceddb0e2a9d3d9e1a5a ("parisc: move
include/asm-parisc to arch/parisc/include/asm") from the parisc tree.

I just removed the file.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]