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

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

582fd487611baa06b07665978429192390c29b8f