From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 31 Jul 2008 16:43:41 +0000 (+0200)
Subject: Merge branch 'linus' into timers/hpet
X-Git-Tag: v2.6.28-rc1~611^2^3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85e9ca333d03fbd56b9e123c8456f0d98e20faad;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' into timers/hpet
---

85e9ca333d03fbd56b9e123c8456f0d98e20faad
diff --cc drivers/char/hpet.c
index c9bf5d44402d2,b3f5dbc6d8807..f3981ffe20f0e
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@@ -275,9 -217,8 +278,10 @@@ static int hpet_open(struct inode *inod
  	devp->hd_irqdata = 0;
  	devp->hd_flags |= HPET_OPEN;
  	spin_unlock_irq(&hpet_lock);
+ 	unlock_kernel();
  
 +	hpet_timer_set_irq(devp);
 +
  	return 0;
  }