From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Sep 2008 18:44:11 +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=afa153fd7b6afcd55dd6df6aea06bb53aa1d3608;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide/Kconfig: mark ide-scsi as deprecated
  ide-disk: remove stale init_idedisk_capacity() documentation
  palm_bk3710: improve IDE registration
  ide: fix hwif_to_node()
  IDE: palm_bk3710: fix compile warning for unused variable
  IDE: compile fix for sff_dma_ops
---

afa153fd7b6afcd55dd6df6aea06bb53aa1d3608