tree 3d23ddec72419e33dbe1452b6a36b098ee2011cf
parent a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35
parent 74194cc71074c8bc17690a5d826093fb6f6e9928
author Linus Torvalds <torvalds@linux-foundation.org> 1232995384 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232995384 -0800

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