]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 03:16:31 +0000 (19:16 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 03:16:31 +0000 (19:16 -0800)
commited2887ed346385c8daf0509e95e02b1c131e1727
tree1fd355ab8273cf6d3cc4d7f744370a8e8969a0a5
parentdcdb2e2030503e046cc4b42cd7e7ee9bc691c3f0
parented976e0bda7cd105d2130e525f86f7a0158736fc
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:
  Revert "[PATCH] Add 0x7110 piix to ata_piix.c"
  [libata] sata_nv: Add PCI IDs
  [PATCH] ahci: fix status register check in ahci_softreset