From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 29 Oct 2007 19:12:34 +0000 (-0700)
Subject: Merge branch 'alpm' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
X-Git-Tag: v2.6.24-rc2~98
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3529a233421fc43fa7bfdf7a4317daf28348a23d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'alpm' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'alpm' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] AHCI: add hw link power management support
  [libata] Link power management infrastructure
---

3529a233421fc43fa7bfdf7a4317daf28348a23d