Linux kernel 2.6.32.47

Conflicts:

	fs/proc/base.c

Conflicts:

	fs/proc/base.c