Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 23:02:07 +0000 (16:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 23:02:07 +0000 (16:02 -0700)
commit1a041a23da7c77b53c71fe11b4f940388bee37b1
tree15be66d3768d609a477a99a0d59522133a831ee0
parentee13cbdec4381b5bdb24683b5e7fcc29084c355d
parentff4878089e1eaeac79d57878ad4ea32910fb4037
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Do not try to disable hpet if it hasn't been initialized before
  x86, i8259: Only register sysdev if we have a real 8259 PIC