]> bbs.cooldavid.org Git - net-next-2.6.git/commit
m68k: merge the mmu and non-mmu versions of bug.h
authorGreg Ungerer <gerg@uclinux.org>
Fri, 6 Feb 2009 04:44:11 +0000 (14:44 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 24 Mar 2009 05:17:44 +0000 (15:17 +1000)
commitdbc367eb69cedf47c702310e4abe1514d52abb4b
treef61d49e8b29464fa48d121a8d414b413e8218de5
parentb0ffbf26124563fa17ef5a35266ee8e3f3ab2b91
m68k: merge the mmu and non-mmu versions of bug.h

Trivial merge of the mmu and non-mmu versions of bug.h

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/bug.h
arch/m68k/include/asm/bug_mm.h [deleted file]
arch/m68k/include/asm/bug_no.h [deleted file]