tree 5244e85d0dfb2619b0af4bc80a2c99dd579f79a5
parent 35d138ae22f826f95f0f8d0285947582ccf4508f
parent 58b6c58caef7a34eab7ec887288fa495696653e7
author Linus Torvalds <torvalds@g5.osdl.org> 1136957484 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1136957484 -0800

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