summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:49:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:49:24 -0700
commit5f87e54d7d6f58e8f15819cf8901860d9512e8b4 (patch)
tree0b1d754b2492a8887c0e4773437b376c381ab743 /net
parent01da47059ab54544a508b217598fb0e73b73e7a8 (diff)
parent5db5b0215af94a36d4bf10900ff9707b6d5c1610 (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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions