From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Jun 2006 20:45:41 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.17~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=37b0d1dedcedf555e2940bc7702c11e2b572299f;p=linux-2.6-omap-h63xx.git

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

37b0d1dedcedf555e2940bc7702c11e2b572299f