ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
boot | ||
crypto | ||
ia32 | ||
kernel | ||
lib | ||
mm | ||
oprofile | ||
pci | ||
Kconfig | ||
Kconfig.debug | ||
Makefile | ||
defconfig |
ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
boot | ||
crypto | ||
ia32 | ||
kernel | ||
lib | ||
mm | ||
oprofile | ||
pci | ||
Kconfig | ||
Kconfig.debug | ||
Makefile | ||
defconfig |