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

1 files changed, 4 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 681d6152e003..4720f8ca211a 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1612,6 +1612,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: { parport<nr> | timid | 0 }
                         See also Documentation/parport.txt.
 
+        pmtmr=          [X86] Manual setup of pmtmr I/O Port. 
+                        Override pmtimer IOPort with a hex value.
+                        e.g. pmtmr=0x508
+
         pnpacpi=        [ACPI]
                         { off }