Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
commit6d71135d635f84b584df55096627ed750c069e61
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 18:58:10 +0000 (14 11:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 18:58:10 +0000 (14 11:58 -0700)
tree0dd88dc78141540b37bfc7ce1b7088488af227e6
parent1d885526f2f3fffacee2ecb541270bd00168adff
parent5d82720a7f41f0c877e026c7d17e3bf20ccdbae0
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: save the returned value of dma_map_sg
  ide-floppy: do not map dataless cmds to an sg