Linus Torvalds ab396e91bf Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild ...

Fix up some trivial conflicts in {i386|ia64}/Makefile

2006-01-10 08:21:33 -08:00

..

compressed

…

tools

…

.gitignore

…

bootsect.S

…

install.sh

…

Makefile

…

mtools.conf.in

…

setup.S

…

video.S

…