projects / platform / kernel / linux-3.10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a46add7 8e48b6b)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:46:56 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:46:56 +0000 (15:46 -0700)
commite228c1b51ef572843827630e643a682ef492b933
tree77360b4dadfbe2c33b8c7ef594a4f9494d00f858tree | snapshot
parenta46add72f79bb8196f07a860adddd312ca398eeccommit | diff
parent8e48b6b307085ce8a747cf94294742f7b7a11b18commit | diff
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
  pata_sil680: remove duplicate pcim_enable_device
  libata-sff: kill spurious WARN_ON() in ata_hsm_move()
  sata_nv: disable hardreset for generic
  ahci: disable PMP for marvell ahcis
  sata_mv: add RocketRaid 1720 PCI ID to driver
  ahci, pata_marvell: play nicely together
Domain: System / Kernel;