| commit | 890f74291c9133eaed6c0eb8514f7618d43d0925 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 19 16:42:11 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri May 19 16:42:11 2006 -0700 |
| tree | 445a9de7b2e554bde5ec9d18d67f2c56e8477d16 | |
| parent | b0c51b7d650d5109c8e71e19d5e7ce9b71af7dff [diff] | |
| parent | c2a4c40651e08e465d3a6130bd9f6dcc1ce21d83 [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