Merge commit 'v2.6.30-rc3' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Apr 2009 10:44:16 +0000 (12:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Apr 2009 10:44:20 +0000 (12:44 +0200)
commit3568b71d46bea87da1936902b6fbb2a3b1154b3d
tree621ba4ccef15b87ce16f0fc2cc1e9b2a3f565ffc
parent2a3313f494c2f3f74a27d66f0f14b38558b7dba2
parent091069740304c979f957ceacec39c461d0192158
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>