tree ce0b69ccd8f147d5eb7c4d75d45dbb67b4a4ff0a
parent d374c1c1281d6188a0d0676172b1c0e3de35c6e7
parent 56f1319e877a969b814b3805c77ea9c31d849f54
author Linus Torvalds <torvalds@g5.osdl.org> 1150145141 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1150145141 -0700

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix Integrator and Versatile interrupt initialisation
  [ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
  [ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
  [ARM] Fix Neponset IRQ handling