tree 9500951ff367f40604f19608490466da1f2607c5
parent 511b00a3194167bad447d4c81027d6a44920dfd2
parent 0803c30c23d39e1db88d06ef59c30fa5ef6c3ada
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174359916 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174359916 -0700

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