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

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

af74c3a61d24ab42c04052ddd2343de972a1cc07