Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:33:01 +0000 (10:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:33:01 +0000 (10:33 -0800)
commitac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132
treed498e947176f4b77938034ff6c6427f9875da721
parent9f4863b7dc7f545bb3a01746feafdc1208e86c89
parent49148020bcb6910ce71417bd990a5ce7017f9bd3
Merge branch 'for-next' of git://git./linux/kernel/git/gerg/m68knommu

* '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
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