summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:27:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:27:39 -0700
commitcc896f08717c445235554a7963a7b2ecf58911ad (patch)
tree1f3bdd0d1b7b503e2344755ff03e0862c8eb9a01 /kernel
parent87129d96265cebcb1176896746d285b46c2d7b36 (diff)
parentca20aa6954bcb4537064a1bf5e8f74af57da2a03 (diff)
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions