| commit | b689e83961e6b2e39bf378c1468fd7d7a924656c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 18 17:40:13 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 18 17:40:13 2008 -0700 |
| tree | 752fe8c068e9ce2f63eaf2d0b1dbb311ecd42906 | |
| parent | a7f5aaf36ded825477c4d7167cc6eb1bcdc63191 [diff] | |
| parent | b59116205c54c89df9cc80721b59e1e8d14488f1 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ata: add missing ATA_* defines ata: add missing ATA_CMD_* defines ata: add missing ATA_ID_* defines (take 2) sgiioc4: fixup message on resource allocation failure ide-cd: use bcd2bin/bin2bcd cdrom: handle TOC gdrom: add dummy audio_ioctl handler viocd: add dummy audio ioctl handler cleanup powerpc/include/asm/ide.h drivers/ide/pci/: use __devexit_p()