Merge branch 'alpm' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
commit3529a233421fc43fa7bfdf7a4317daf28348a23d
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 19:12:34 +0000 (29 12:12 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 29 Oct 2007 19:12:34 +0000 (29 12:12 -0700)
tree520558ffb70e4f4743495ad7a62d4c775c0c1ea3
parent00cda56d39f013cce60f44f1e3da19b87eba5d85
parent31556594f913fa81d008cecfe46d7211c919a853
Merge branch 'alpm' of /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
drivers/ata/libata-core.c