From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 4 May 2006 21:52:43 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.17-rc4~42
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c;p=~emulex%2Finfiniband.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3490/1: i.MX: move uart resources to board files
  [ARM] 3488/1: make icedcc_putc do the right thing
  [ARM] 3487/1: IXP4xx: Support non-PCI systems
  [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros
---

f9cc8475e7595dbb41a9567f83288e2cd7445b6c