From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Mar 2009 18:58:10 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: firefly_0821_release~15307
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d71135d635f84b584df55096627ed750c069e61;p=firefly-linux-kernel-4.4.55.git

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
---

6d71135d635f84b584df55096627ed750c069e61