git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f4863b 4914802)
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)
* '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 patch | diff1 | diff2 | blob | history
arch/m68k/include/asm/Kbuild patch | diff1 | diff2 | blob | history
arch/m68k/include/asm/byteorder_mm.h patch | diff1 | diff2 | blob | history
arch/m68k/include/asm/byteorder_no.h patch | diff1 | diff2 | blob | history
arch/m68k/include/asm/unistd_mm.h patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc arch/m68k/include/asm/Kbuild
Simple merge
diff --cc arch/m68k/include/asm/byteorder_mm.h
Simple merge
diff --cc arch/m68k/include/asm/byteorder_no.h
Simple merge
diff --cc arch/m68k/include/asm/unistd_mm.h
Simple merge
Full containers within linux kernel