]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Oct 2010 15:47:45 +0000 (08:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Oct 2010 15:47:45 +0000 (08:47 -0700)
* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Hpet: Avoid the comparator readback penalty

1  2 
arch/x86/kernel/hpet.c

Simple merge