Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 23:49:24 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 23:49:24 +0000 (16:49 -0700)
commit5f87e54d7d6f58e8f15819cf8901860d9512e8b4
tree0b1d754b2492a8887c0e4773437b376c381ab743
parent01da47059ab54544a508b217598fb0e73b73e7a8
parent5db5b0215af94a36d4bf10900ff9707b6d5c1610
Merge branch 'upstream-linus' of git://git./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