]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccaa36f 94e45a2)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 15:53:26 +0000 (08:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 15:53:26 +0000 (08:53 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more.
  [SPARC64]: Move signal compat bits to new header file.

1  2 
arch/sparc64/kernel/sys_sparc32.c patch | diff1 | diff2 | blob | history
arch/sparc64/kernel/sys_sunos32.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc64/kernel/sys_sparc32.c
Simple merge
diff --cc arch/sparc64/kernel/sys_sunos32.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.