ngo@elte.hu> 1230540315 +0100
committer Ingo Molnar <mingo@elte.hu> 1230540315 +0100

Merge branch 'linus' into perfcounters/core

Conflicts:
	fs/exec.c
	include/linux/init_task.h

Simple context conflicts.
ÖÃt£‘5x