From: Ingo Molnar Date: Sun, 9 Aug 2009 10:46:45 +0000 (+0200) Subject: Merge branch 'linus' into tracing/urgent X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e3560336be655c6791316482fe288b119f34c427;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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