Merge branch 'linus' into timers/hpet

diff --cc Documentation/00-INDEX
Simple merge

diff --cc drivers/char/hpet.c
index c9bf5d4,b3f5dbc..f3981ff
--- 1/drivers/char/hpet.c
--- 2/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;
  }