]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Aug 2008 00:40:13 +0000 (17:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Aug 2008 00:40:13 +0000 (17:40 -0700)
commitb689e83961e6b2e39bf378c1468fd7d7a924656c
tree752fe8c068e9ce2f63eaf2d0b1dbb311ecd42906
parenta7f5aaf36ded825477c4d7167cc6eb1bcdc63191
parentb59116205c54c89df9cc80721b59e1e8d14488f1
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()