From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 19 Apr 2006 01:01:19 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.17-rc2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c63f774ca10efa7cbcbd555c072353e1a7ab7fbe;p=linux-2.6

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3479/1: Corgi SSP: Fix potential concurrent access problem
  [ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure
---

c63f774ca10efa7cbcbd555c072353e1a7ab7fbe