From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 30 Jul 2006 05:53:46 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.18-rc3~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af652c26f5f0eceb6d8cb97eb9b86fba6f1f3b85;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] 3734/1: Fix the unused variable warning in __iounmap()
  [ARM] 3737/1: Export ARM copy/clear_user_page symbols
  [ARM] 3736/1: xscale: don't mis-report 80219 as an iop32x
  [ARM] 3733/2: S3C24XX: Remove old IDE registers in Anubis
  [ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines
  [ARM] Fix SMP booting
  [ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist
  [ARM] 3730/1: ep93xx: enable usb ohci driver in the defconfig
  [ARM] Fix cats build
---

af652c26f5f0eceb6d8cb97eb9b86fba6f1f3b85