tree 913cc058b162c48e6c72d2b016b9e44201b16cee
parent bcd039b230f738243193ef7dbb03298d967b8370
parent 2161558fa5bebfeb272493ae91e836b497029023
author Linus Torvalds <torvalds@g5.osdl.org> 1132352740 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1132352740 -0800

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