]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/urgent'
authorIngo Molnar <mingo@kernel.org>
Tue, 4 Sep 2012 15:30:59 +0000 (17:30 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Sep 2012 15:30:59 +0000 (17:30 +0200)
1  2 
include/linux/perf_event.h
kernel/events/core.c

Simple merge
Simple merge