Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Jun 2006 23:02:41 +0000 (16:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Jun 2006 23:02:41 +0000 (16:02 -0700)
commit891eca1447a94b25fb59b696f839a2a6897d8f1f
tree2ebdf249e13acb792f6d15c47ae9634221fc0c55
parent48e49ead3e92d53196a78c42cf24c0eed6ca98dd
parentec8510f6fe57f59e42484809679af31ca7896dcf
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