From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 2 Jun 2006 23:02:41 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.17-rc6~49
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=891eca1447a94b25fb59b696f839a2a6897d8f1f;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] 3540/1: ixp23xx: deal with gap in interrupt bitmasks
  [ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping
---

891eca1447a94b25fb59b696f839a2a6897d8f1f