tree 470e3c59ef39f38bcd69f8fef7dba8f76afbec53
parent 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed
parent 061e41fdb5047b1fb161e89664057835935ca1d2
author Ingo Molnar <mingo@elte.hu> 1228244990 +0100
committer Ingo Molnar <mingo@elte.hu> 1228244990 +0100

Merge branch 'linus' into cpus4096

Conflicts:
	kernel/trace/ring_buffer.c