Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2009-03-14 11:58:10 -07:00

parent 1d885526f2 5d82720a7f

commit 6d71135d63

4 changed files with 26 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

drivers/ide/ide-atapi.c

View file

12

drivers/ide/ide-dma.c

View file

6

drivers/ide/ide-floppy.c

View file

1

include/linux/ide.h

View file