Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>