Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 22:46:49 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 22:46:49 +0000 (15:46 -0700)
commit486a153f0e294f7cc735838edcb6b32e623cbe52
treef16a31eb3526968dd08aa93c12cbb211f31f2084
parent9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0
parentf64a227b6b5cc1f8cc7f6ef9cc3351343636bac9
Merge /pub/scm/linux/kernel/git/sam/kbuild
arch/ia64/kernel/entry.S
arch/ppc64/Makefile
arch/ppc64/kernel/misc.S
arch/s390/Makefile