From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 2 Oct 2007 17:40:20 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.23~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2910ca6f8ae69648623b3c05b79be87dd7bda73d;p=linux-2.6-omap-h63xx.git

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:
  ata_piix: add another TECRA M3 entry to broken suspend list
---

2910ca6f8ae69648623b3c05b79be87dd7bda73d