tree 445a9de7b2e554bde5ec9d18d67f2c56e8477d16
parent b0c51b7d650d5109c8e71e19d5e7ce9b71af7dff
parent c2a4c40651e08e465d3a6130bd9f6dcc1ce21d83
author Linus Torvalds <torvalds@g5.osdl.org> 1148082131 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1148082131 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3533/1: Implement the __raw_(read|write)_can_lock functions on ARM
  [ARM] 3530/1: PXA Mainstone: prevent double enable_irq() in pcmcia
  [ARM] 3529/1: s3c24xx: fix restoring control register with undefined instruction