tree 621ba4ccef15b87ce16f0fc2cc1e9b2a3f565ffc
parent 2a3313f494c2f3f74a27d66f0f14b38558b7dba2
parent 091069740304c979f957ceacec39c461d0192158
author Ingo Molnar <mingo@elte.hu> 1240397056 +0200
committer Ingo Molnar <mingo@elte.hu> 1240397060 +0200

Merge commit 'v2.6.30-rc3' into x86/urgent

Merge reason: hpet.c changed upstream, make sure we test against that

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