[LinuxPPS] 19 Aug 00:40 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linuxpps: Linus Torvalds <>]

Merge git://git./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()  
  
arch/powerpc/include/asm/ide.h  
drivers/cdrom/cdrom.c  
drivers/cdrom/gdrom.c  
drivers/cdrom/viocd.c  
drivers/ide/ide-cd.c  
drivers/ide/pci/aec62xx.c  
drivers/ide/pci/cy82c693.c  
drivers/ide/pci/hpt366.c  
drivers/ide/pci/it821x.c  
drivers/ide/pci/pdc202xx_new.c  
drivers/ide/pci/scc_pata.c  
drivers/ide/pci/sgiioc4.c  
drivers/ide/pci/siimage.c  
drivers/ide/pci/sis5513.c  
drivers/ide/pci/tc86c001.c  
drivers/ide/pci/via82cxxx.c  
include/linux/ata.h

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=b689e83961e6b2e39bf378c1468fd7d7a924656c