From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 27 Sep 2005 20:33:25 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.14-rc3~100
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95001ee9256df846e374f116c92ca8e0beec1527;p=linux-2.6

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

95001ee9256df846e374f116c92ca8e0beec1527