From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Aug 2008 00:40:13 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b689e83961e6b2e39bf378c1468fd7d7a924656c;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

b689e83961e6b2e39bf378c1468fd7d7a924656c