Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:43:04 +0000 (10:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:43:04 +0000 (10:43 -0800)
commitbf50c903faba4ec7686ee8a570ac384b0f20814d
tree3d23ddec72419e33dbe1452b6a36b098ee2011cf
parenta90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35
parent74194cc71074c8bc17690a5d826093fb6f6e9928
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