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)
commitf32e3555834c4bc95fccba1aa245d95b3a0a0bc8
tree9500951ff367f40604f19608490466da1f2607c5
parent511b00a3194167bad447d4c81027d6a44920dfd2
parent0803c30c23d39e1db88d06ef59c30fa5ef6c3ada
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