Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Linus Torvalds [Mon, 26 Jan 2009 18:33:01 +0000 (10:33 -0800)]
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

1  2 
Makefile
arch/m68k/include/asm/Kbuild
arch/m68k/include/asm/byteorder_mm.h
arch/m68k/include/asm/byteorder_no.h
arch/m68k/include/asm/unistd_mm.h

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge