![]() 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> |
||
---|---|---|
.. | ||
boot | ||
include/asm | ||
kernel | ||
lib | ||
mb93090-mb00 | ||
mm | ||
defconfig | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |