tree bca1fcfef55b3e3e82c9a822b4ac6428fce2b419
parent 2b583d8bc8d7105b58d7481a4a0ceb718dac49c6
parent 3c92ec8ae91ecf59d88c798301833d7cf83f2179
author Ingo Molnar <mingo@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.