tree 0b1d754b2492a8887c0e4773437b376c381ab743
parent 01da47059ab54544a508b217598fb0e73b73e7a8
parent 5db5b0215af94a36d4bf10900ff9707b6d5c1610
author Linus Torvalds <torvalds@linux-foundation.org> 1268956164 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1268956164 -0700

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: pp->active_link is not reliable when FBS is enabled
  ahci: use BIOS date in broken_suspend list
  ahci: add missing nv IDs