Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:26:12 +0000 (21:26 -0700)
commit51bece910d2b0aca64cd3dee9fa2a8aa7feeadd9
tree4bd5332323a26b020dfeac6eb2e77fba790aed2e
parentd8cb7c1ded6e5a80a7335716dde60784a0d51c1d
parent63104eec234bdecb55fd9c15467ae00d0a3f42ac
Merge git://git./linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: introduce utsrelease.h
  kbuild: explicit turn off gcc stack-protector
arch/powerpc/platforms/chrp/setup.c
arch/powerpc/platforms/powermac/bootx_init.c