Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:28:53 +0000 (08:28 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:28:53 +0000 (08:28 -0800)
commitdd49f96777d5a72d5591ac2112d4ac940391774e
tree6d9c8bdcd21c600ce1a1c8ea8acb9aec15f6ca4a
parenta62e68488dd5ddb07776555fd7e0435c6d021ac1
parent8b4ad5e3ff94409973e824716c65568f0d97364c
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
arch/sparc64/kernel/systbls.S