summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-16 21:28:49 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-16 21:28:49 -0700
commitb2cd64153b94473f6bd82448a68b8e8c041676ea (patch)
tree327778fbc139079921eeb73bebf10af4327f79c8 /init
parentb17bfca5f16a6090ee51250163e1720f6fe71515 (diff)
parent13b8d09f5de0aaa3153bbccc98baf247387823dc (diff)
downloadlinux-3.10-b2cd64153b94473f6bd82448a68b8e8c041676ea.tar.gz
linux-3.10-b2cd64153b94473f6bd82448a68b8e8c041676ea.tar.bz2
linux-3.10-b2cd64153b94473f6bd82448a68b8e8c041676ea.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: track spindown status and skip spindown_compat if possible libata: fix shutdown warning message printing libata-acpi: add ATA_FLAG_ACPI_SATA port flag libata: during revalidation, check n_sectors after device is configured libata: separate out ata_dev_reread_id() pata_scc had been missed by ata_std_prereset() switch
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions