Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Mar 2007 03:44:13 +0000 (19:44 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 7 Mar 2007 03:44:13 +0000 (19:44 -0800)
commitae5dd8e346efc25a5f9cc9d01bc0915c40eb38d9
tree993d3486db9bd154859d20026875c11292e4e143
parent38f3323037de22bb0089d08be27be01196e7148b
parent63ed71019c4437caef65fca1f83c990ae729024f
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:
  pata_pdc202xx_old: fix data corruption and other problems
  pata_legacy: fix io/irq mismatch
  ahci: RAID mode SATA patch for Intel ICH9M