tree 850ea412b013360bcace751db91cac6fb0067535
parent 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8
parent 68ee3eb8295c9c164071fcbd367c419121bd55f8
author Linus Torvalds <torvalds@g5.osdl.org> 1139019467 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1139019467 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6