Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 14 Feb 2006 03:40:19 +0000 (19:40 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 14 Feb 2006 03:40:19 +0000 (19:40 -0800)
commita110d514a582553e7439e92d92fb062d80b3e21d
treeaa8fd4abd430fa393c00e880d7d8145e4f7ee0a2
parent934a3595b30c986bab52bc9c08d12c8962c88c8a
parent28b2425ac76b0f043f2efd34521f2a3c7ec8ccc5
Merge branch 'master' of /linux/kernel/git/kyle/parisc-2.6