tree 3c36672829527bef6951ca2f1eae7da4285fee31
parent 5ea8051a23de7b39bd5efebcaf63c05fd03f0d98
parent 963f48a116bf3b797fe184e74c79c50de1da70bb
author Linus Torvalds <torvalds@g5.osdl.org> 1132628684 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1132628684 -0800

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