tree 752fe8c068e9ce2f63eaf2d0b1dbb311ecd42906
parent a7f5aaf36ded825477c4d7167cc6eb1bcdc63191
parent b59116205c54c89df9cc80721b59e1e8d14488f1
author Linus Torvalds <torvalds@linux-foundation.org> 1219106413 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219106413 -0700

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()