tree 4ba588631dd8189a818a91c9e3976526071178b6
parent 1130b0296184bc21806225fd06d533515a99d2db
parent 56a50adda49b2020156616c4eb15353e0f9ad7de
author Ingo Molnar <mingo@elte.hu> 1241009219 +0200
committer Ingo Molnar <mingo@elte.hu> 1241009225 +0200

Merge branch 'linus' into perfcounters/core

Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
              the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>