| commit | 2c4ac99f983f1341b5962a16b5e8de6049bf10b5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 18 22:48:30 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 18 22:48:30 2011 -0700 |
| tree | 8f1dff6d9b1f8314807807eecf21ee5734a4c61b | |
| parent | 35a21b429917baf86d7595826e7314662ec09d0a [diff] | |
| parent | a081da630d64acf132b2db1043c586b993d49da7 [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * '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