tree 216030731d911249496d2e97206cd61431e31c89
parent d2517a49d55536b38c7a87e5289550cfedaa4dcc
parent 1406de8e11eb043681297adf86d6892ff8efc27a
author Ingo Molnar <mingo@elte.hu> 1242625064 +0200
committer Ingo Molnar <mingo@elte.hu> 1242625069 +0200

Merge commit 'v2.6.30-rc6' into perfcounters/core

Merge reason: this branch was on an -rc4 base, merge it up to -rc6
              to get the latest upstream fixes.

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