Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@kernel.org>
Fri, 19 Jul 2013 07:34:42 +0000 (09:34 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 19 Jul 2013 07:34:42 +0000 (09:34 +0200)
commite43fff2b98b4e99b189c086a9cf740b19eaf3538
tree658a5f73d5806fe47856547b17cbd23592856c62
parent67516844625f45f0ce148a01c27bf41f591872b2
parentecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b
Merge branch 'linus' into perf/core

Merge in a v3.11-rc1-ish branch to go from v3.10 based development
to a v3.11 based one.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c