diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-24 17:32:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-24 17:32:16 -0700 |
commit | e0b9d139f2595fafbe95fcb7b40109db724900e8 (patch) | |
tree | 4fafc9622d913ea1398b4471ed6f6ce9b38cab1d /drivers/cdrom/cdrom.c | |
parent | 4f33e21c923c1656fb9e3d6fe2302e34e9e079a4 (diff) | |
parent | 1146fe30504a1edd8a434f500e1be139492570c9 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] SMTC: Make ack_bad_irq() safe with no IM backstop.
Diffstat (limited to 'drivers/cdrom/cdrom.c')
0 files changed, 0 insertions, 0 deletions