Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts:
	arch/x86/kernel/setup_percpu.c
	arch/x86/mm/fault.c
	drivers/acpi/processor_idle.c
	kernel/irq/handle.c

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index ae6036300f60..9fc13a2cc3f4 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -118,7 +118,8 @@ static void __init omap2_gp_clockevent_init(void)
         clockevent_gpt.max_delta_ns =
                 clockevent_delta2ns(0xffffffff, &clockevent_gpt);
         clockevent_gpt.min_delta_ns =
-                clockevent_delta2ns(1, &clockevent_gpt);
+                clockevent_delta2ns(3, &clockevent_gpt);
+                /* Timer internal resynch latency. */
 
         clockevent_gpt.cpumask = cpumask_of(0);
         clockevents_register_device(&clockevent_gpt);