tree c2413fe7180f480b4ecdfd91bdfc0f23ff7df8a5
parent 27f4e0834746196f219e3e030ca71ffd3b176483
parent 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5
author Linus Torvalds <torvalds@g5.osdl.org> 1134952316 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1134952316 -0800

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394