From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 1 Apr 2007 21:43:57 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.21-rc6~37
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2e175a90047a2dbc76fde169c990164895b25dfc;p=~emulex%2Finfiniband.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4298/1: fix memory barriers for DMA coherent and SMP platforms
  [ARM] 4295/2: Fix error-handling in pxaficp_ir.c (version 2)
  [ARM] Fix __NR_kexec_load
  [ARM] Export dma_channel_active()
  [ARM] 4296/1: ixp4xx: compile fix
  [ARM] 4289/1: AT91: SAM9260 NAND flash timing
---

2e175a90047a2dbc76fde169c990164895b25dfc