summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-18 16:31:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-18 16:31:56 -0800
commit23cb3ada1b011f708ff881b66b2cfb6c11068fa5 (patch)
treec2413fe7180f480b4ecdfd91bdfc0f23ff7df8a5 /usr
parent27f4e0834746196f219e3e030ca71ffd3b176483 (diff)
parent16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions