Merge commit 'linus/master' into HEAD

Conflicts:
	MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
This commit is contained in:
Vegard Nossum
2009-06-15 15:50:49 +02:00
2130 changed files with 172928 additions and 37398 deletions

View File

@@ -326,4 +326,6 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
return kmalloc_node(size, flags | __GFP_ZERO, node);
}
void __init kmem_cache_init_late(void);
#endif /* _LINUX_SLAB_H */