linux-next: manual merge of the m68knommu tree with the m68k tree

From: Stephen Rothwell
Date: Tue Jun 21 2011 - 21:13:16 EST

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/include/asm/bitops_mm.h between commit 17c74432b88e
("m68k/bitops: Make bitmap data pointer of atomic ops volatile") from the
m68k tree and commit 2cb0d89e66b1 ("m68k: merge mmu and non-mmu
bitops.h") from the m68knommu tree.

The latter effectively deletes in the file and in doing the merge,
removes the funtions that were modified by the former commit. So I just
removed the file.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature