]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/urgent'
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:30 +0000 (13:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:54:30 +0000 (13:54 +0200)
1  2 
include/linux/perf_event.h
kernel/events/core.c
tools/lib/lockdep/Makefile

Simple merge
Simple merge
Simple merge