Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
	include/linux/kernel_stat.h
This commit is contained in:
Ingo Molnar 2009-01-11 02:42:53 +01:00
commit 506c10f26c
6192 changed files with 842449 additions and 152253 deletions

View file

@ -12,6 +12,7 @@
#include <net/net_namespace.h>
extern struct files_struct init_files;
extern struct fs_struct init_fs;
#define INIT_KIOCTX(name, which_mm) \
{ \