Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  cs5536: define dma_sff_read_status() method
  ide: fix barriers support
  ide: Remove void casts
  hpt366: use ATA_DMA_* constants
  hpt366: fix HPT370 DMA timeouts

...

This commit is contained in:

Linus Torvalds 2009-04-18 12:07:25 -07:00

parent 62f2730a11 15da90b516

commit df89f1ba97

4 changed files with 17 additions and 11 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

1

drivers/ide/cs5536.c

View file

14

drivers/ide/hpt366.c

View file

11

drivers/ide/ide-io.c

View file

2

drivers/ide/pmac.c

View file