From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 20 Feb 2007 20:14:32 +0000 (-0800)
Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.21-rc1~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e696268a73f7f59a333624f9abf8ffc9412ee64c;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT
  [ARM] Fix s3c2410 ALSA audio for typedef elimination
  [ARM] Fix ARM AACI ALSA driver
  [ARM] fix mach-at91 build breakage
  [ARM] Fix jornada720 build errors
  [ARM] Fix iop13xx build error
  [ARM] Fix build error caused by move of apm
  [ARM] 4223/1: ixdp2351 : Fix for a define error
  [ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx
  [ARM] 4186/1: iop: remove cp6_enable/disable routines
  [ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user
---

e696268a73f7f59a333624f9abf8ffc9412ee64c