From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 6 Oct 2005 21:16:07 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.14-rc4~40
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dce32c781b1c026863a254fe8123dd78c59ad984;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
---

dce32c781b1c026863a254fe8123dd78c59ad984