From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 4 Oct 2005 15:11:13 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.14-rc4~57
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43d0b1376dc7abc29411fa31f50fe7cfb68afcd3;p=linux-2.6

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

43d0b1376dc7abc29411fa31f50fe7cfb68afcd3