tree 43ca9a6b489aaa3918b773f78a7eda37458ef0a8
parent 26528e773ecc74fb1b61b7275f86f761cbb340ec
parent 7b2aa037e878c939676675969983284a02958ae3
author Ingo Molnar <mingo@elte.hu> 1249814805 +0200
committer Ingo Molnar <mingo@elte.hu> 1249814809 +0200

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 <mingo@elte.hu>