Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 23 Nov 2005 00:51:33 +0000 (16:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 23 Nov 2005 00:51:33 +0000 (16:51 -0800)

Trivial merge