Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 17:40:20 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 2 Oct 2007 17:40:20 +0000 (10:40 -0700)
commit2910ca6f8ae69648623b3c05b79be87dd7bda73d
tree65b37405618fc494aaa5c7b5be247d7e9cffec0d
parentd237098c03eb91cef240e9a1b248c0e1ecd1c80c
parent4c74d4ec3524a8f31deadd115139dd93bc91d598
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:
  ata_piix: add another TECRA M3 entry to broken suspend list