ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
4xx_io | ||
8xx_io | ||
8260_io | ||
amiga | ||
boot | ||
configs | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
platforms | ||
syslib | ||
xmon | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |
ab396e91bf
Fix up some trivial conflicts in {i386|ia64}/Makefile |
||
---|---|---|
.. | ||
4xx_io | ||
8xx_io | ||
8260_io | ||
amiga | ||
boot | ||
configs | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
platforms | ||
syslib | ||
xmon | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |