5b02ee3d21
Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
amiga | ||
apollo | ||
atari | ||
bvme6000 | ||
configs | ||
fpsp040 | ||
hp300 | ||
ifpsp060 | ||
include/asm | ||
kernel | ||
lib | ||
mac | ||
math-emu | ||
mm | ||
mvme16x | ||
mvme147 | ||
q40 | ||
sun3 | ||
sun3x | ||
tools/amiga | ||
install.sh | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |