forked from luck/tmp_suning_uos_patched
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> |
||
---|---|---|
.. | ||
asm | ||
cpu-common/cpu | ||
cpu-sh2/cpu | ||
cpu-sh2a/cpu | ||
cpu-sh3/cpu | ||
cpu-sh4/cpu | ||
cpu-sh5/cpu | ||
mach-common/mach | ||
mach-dreamcast/mach | ||
mach-landisk/mach | ||
mach-se/mach | ||
mach-sh03/mach |