From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 4 Jul 2006 04:30:03 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.18-rc1~19
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=060ec6f2fb3c8abb85927758de8ac5d1018e6a43;p=cascardo%2Flinux.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix lh7a40x_udc.c
  [ARM] Fix warning in consistent.c
  [ARM] Fix warnings in arch/arm/kernel/setup.c
  [ARM] Fix ecard.c resource warnings.
  [ARM] Fix ISA IRQ resources
  [ARM] Fix bad asm instruction in proc-arm925.S
  [ARM] More missing proc-macros.S includes
  [ARM] 3708/2: fix SMP build after section ioremap changes
---

060ec6f2fb3c8abb85927758de8ac5d1018e6a43