From: Ingo Molnar Date: Sun, 9 Aug 2009 10:46:45 +0000 (+0200) Subject: Merge branch 'linus' into tracing/urgent X-Git-Tag: firefly_0821_release~13000^2~75 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3560336be655c6791316482fe288b119f34c427;p=firefly-linux-kernel-4.4.55.git Merge branch 'linus' into tracing/urgent Merge reason: Merge up to almost-rc6 to pick up latest perfcounters (on which we'll queue up a dependent fix) Signed-off-by: Ingo Molnar --- e3560336be655c6791316482fe288b119f34c427