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)
Merge reason: hpet.c changed upstream, make sure we test against that

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

Trivial merge