Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  drivers/ata/sata_dwc_460ex.c: add missing kfree
  ata: Add iMX pata support
  pata_via: disable ATAPI DMA on AVERATEC 3200
  [libata] sata_sil: fix used-uninit warning

...

This commit is contained in:

Linus Torvalds 2011-08-18 22:48:30 -07:00

parent 35a21b4299 a081da630d

commit 2c4ac99f98

6 changed files with 288 additions and 9 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

9

drivers/ata/Kconfig

View file

1

drivers/ata/Makefile

View file

253

drivers/ata/pata_imx.c

View file

18

drivers/ata/pata_via.c

View file

14

drivers/ata/sata_dwc_460ex.c

View file

2

drivers/ata/sata_sil.c

View file