Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 20 Mar 2007 03:05:16 +0000 (20:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 20 Mar 2007 03:05:16 +0000 (20:05 -0700)
* 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


Trivial merge