]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 22:02:34 +0000 (14:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 22:02:34 +0000 (14:02 -0800)
commita8a84540eb3fd0493f250dc1c513bef6810a50fd
treea5dc868177093b677ab50fa8aabc21c86cd65011
parentffece4808d253131e910a0e0afada82f60b1980a
parent28c1969ff887bc2a7df39272850dece01de03285
Merge git://git.kernel.org/pub/scm/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