From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 20 Mar 2007 03:05:16 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.21-rc5~54
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32e3555834c4bc95fccba1aa245d95b3a0a0bc8;p=linux-2.6

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4264/1: ldrex/strex syntax errors with recent compilers
  [ARM] Fix breakage caused by 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc
---

f32e3555834c4bc95fccba1aa245d95b3a0a0bc8