summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-03 17:16:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-03 17:16:52 -0700
commit6b4c555a6bebd3886a20f6947b273398fef24935 (patch)
tree5226599d5b9336bfee1da8476bba7331654c8b52 /.gitignore
parent4e78f00261886ed2710460f5ca5253f6ab6007cf (diff)
parent5f098a3ea72e73ad3733c3280fd5ee04816dc999 (diff)
downloadlinux-6b4c555a6bebd3886a20f6947b273398fef24935.tar.bz2
Merge tag 'tag/upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata fixes from Jeff Garzik: 1) Fix regression that could cause a misdiagnosis, which in turn could lead to an erroneous 3.0 Gbps -> 1.5 downshift, particularly when hotplug and suspend/resume is involved. 2) Fix a regression that led to ata%d controller ids being numbered one larger than in <= 3.4-rc3 (oh, the horror!). Controller ids should now be as expected. 3) add some DT, PCI id's 4) ata/pata_arasan_cf: minor cpp fixing/cleaning * tag 'tag/upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata: ahci_platform: Add synopsys ahci controller in DT's compatible list ata/pata_arasan_cf: Move arasan_cf_pm_ops out of #ifdef, #endif macros libata: init ata_print_id to 0 ahci: Detect Marvell 88SE9172 SATA controller libata: skip old error history when counting probe trials
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions