From: Linus Torvalds Date: Tue, 2 Dec 2008 23:53:10 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Tag: v2.6.28-rc8~75 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e2e29831cc463f4be61d4e36b8699ae7e071a685;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: alim15x3: fix sparse warning ide: remove dead code from drive_is_ready() ide: fix build for DEBUG_PM ide: respect current DMA setting during resume ide: add SAMSUNG SP0822N with firmware WA100-10 to ivb_list[] amd74xx: workaround unreliable AltStatus register for nVidia controllers ide: fix the ide_release_lock imbalance --- e2e29831cc463f4be61d4e36b8699ae7e071a685