From: Linus Torvalds 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-Tag: v2.6.27-rc6~76 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=afa153fd7b6afcd55dd6df6aea06bb53aa1d3608;p=linux-2.6-omap-h63xx.git 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: 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