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, 1 insertions, 1 deletions

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index d30bb766fcef..b56a704409d2 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -20,7 +20,7 @@
 
 static inline unsigned int get_irq_flags(struct resource *res)
 {
-        unsigned int flags = IRQF_DISABLED | IRQF_SHARED;
+        unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
 
         flags |= res->flags & IRQF_TRIGGER_MASK;