]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0c51b7 c2a4c40)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 19 May 2006 23:42:11 +0000 (16:42 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 19 May 2006 23:42:11 +0000 (16:42 -0700)
commit890f74291c9133eaed6c0eb8514f7618d43d0925
tree445a9de7b2e554bde5ec9d18d67f2c56e8477d16tree | snapshot
parentb0c51b7d650d5109c8e71e19d5e7ce9b71af7dffcommit | diff
parentc2a4c40651e08e465d3a6130bd9f6dcc1ce21d83commit | diff
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
Linux 2.6 source tree