Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 20 Aug 2005 01:59:49 +0000 (18:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 20 Aug 2005 01:59:49 +0000 (18:59 -0700)

Trivial merge