Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
power_supply: pda_power: Don't request shared IRQs w/ IRQF_DISABLED

drivers/power/pda_power.c

···
 
 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;