From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 17:39:57 +0000 (-0700)
Subject: Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.27-rc1~1081
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da6e88f4963385b1b649b043691d206fbb951913;p=linux-2.6

Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: add PCI ID for 6300ESB force hpet
  x86: add another PCI ID for ICH6 force-hpet
  kernel-paramaters: document pmtmr= command line option
  acpi_pm clccksource: fix printk format warning
  nohz: don't stop idle tick if softirqs are pending.
  pmtmr: allow command line override of ioport
  nohz: reduce jiffies polling overhead
  hrtimer: Remove unused variables in ktime_divns()
  hrtimer: remove warning in hres_timers_resume
  posix-timers: print RT watchdog message
---

da6e88f4963385b1b649b043691d206fbb951913
diff --cc arch/x86/kernel/quirks.c
index 79bdcd11c6,f327abafe3..d138588181
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@@ -262,10 -255,10 +262,12 @@@ static void old_ich_force_enable_hpet_u
  {
  	if (hpet_force_user)
  		old_ich_force_enable_hpet(dev);
 +	else
 +		hpet_print_force_info();
  }
  
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
+ 			 old_ich_force_enable_hpet_user);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,
  			 old_ich_force_enable_hpet_user);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,