From: Linus Torvalds Date: Fri, 9 Dec 2011 16:07:24 +0000 (-0800) Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~3680^2~3970 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=975e32c287a9b144cf115d3f42ca18664b3331df;p=firefly-linux-kernel-4.4.55.git Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Do no try to schedule task events if there are none lockdep, kmemcheck: Annotate ->lock in lockdep_init_map() perf header: Use event_name() to get an event name perf stat: Failure with "Operation not supported" --- 975e32c287a9b144cf115d3f42ca18664b3331df