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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgptyfOe6jM0z.pgp
Description: PGP signature
