ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
boot | ||
crypto | ||
kernel | ||
lib | ||
mach-default | ||
mach-es7000 | ||
mach-generic | ||
mach-visws | ||
mach-voyager | ||
math-emu | ||
mm | ||
oprofile | ||
pci | ||
power | ||
Kconfig | ||
Kconfig.cpu | ||
Kconfig.debug | ||
Makefile | ||
Makefile.cpu | ||
defconfig |