Merge branch 'linus' into tracing/urgent
authorIngo Molnar <mingo@elte.hu>
Sun, 9 Aug 2009 10:46:45 +0000 (12:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 9 Aug 2009 10:46:49 +0000 (12:46 +0200)
commite3560336be655c6791316482fe288b119f34c427
tree43ca9a6b489aaa3918b773f78a7eda37458ef0a8
parent26528e773ecc74fb1b61b7275f86f761cbb340ec
parent7b2aa037e878c939676675969983284a02958ae3
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>