Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:35:51 +0000 (00:35 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:35:51 +0000 (00:35 -0700)
commitef88b7dba2b47c70037a34a599d383462bb74bd3
treef50afe82c446cbf93893880878b97339fbdb8f49
parentf65e77693aa5a1cf688fc378bc6913a56f9ff7b7
parentaaebf4332018980fef4e601d1b5a6e52dd9e9ae4
Merge /pub/scm/linux/kernel/git/sam/kbuild
Makefile
arch/m68knommu/Makefile
arch/mips/Makefile
drivers/block/Kconfig
init/Kconfig