projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b17bfca 13b8d09)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 May 2007 04:28:49 +0000 (21:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 May 2007 04:28:49 +0000 (21:28 -0700)
commitb2cd64153b94473f6bd82448a68b8e8c041676ea
tree327778fbc139079921eeb73bebf10af4327f79c8tree | snapshot
parentb17bfca5f16a6090ee51250163e1720f6fe71515commit | diff
parent13b8d09f5de0aaa3153bbccc98baf247387823dccommit | diff
Merge branch 'upstream-linus' of /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
Domain: System / Uncategorized;