| commit | ca9a702e50287cf429f1c12832319a26a715e70b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 17 20:54:49 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 17 20:54:49 2009 -0700 |
| tree | a29c7c68d2945c47d058b42ecd4475fed5c19fe2 | |
| parent | bbe5a96f678efcad83de8f900ab4ab963a99c805 [diff] | |
| parent | d15d6e6cc340566d53d953ffdec2c9e96816fa52 [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: libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers pata_amd: do not filter out valid modes in nv_mode_filter sata_promise: update reset code sata_promise: disable hotplug on 1st gen chips libata: fix spurious WARN_ON_ONCE() on port freeze ahci: restore pci_intx() handling