From: Linus Torvalds Date: Mon, 30 Nov 2009 22:02:34 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 X-Git-Tag: firefly_0821_release~11829 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8a84540eb3fd0493f250dc1c513bef6810a50fd;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: ide: fix ioctl to pass requested transfer mode to ide_find_dma_mode instead of UDMA6 --- a8a84540eb3fd0493f250dc1c513bef6810a50fd