commit | 5f87e54d7d6f58e8f15819cf8901860d9512e8b4 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 18 16:49:24 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 18 16:49:24 2010 -0700 |
tree | 0b1d754b2492a8887c0e4773437b376c381ab743 | |
parent | 01da47059ab54544a508b217598fb0e73b73e7a8 [diff] | |
parent | 5db5b0215af94a36d4bf10900ff9707b6d5c1610 [diff] |
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