From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 18 Jan 2006 23:08:02 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.16-rc2~355
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3da38566dfd4b2402b280cb52ffc7c56f1a95b9c;p=linux-2.6

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

3da38566dfd4b2402b280cb52ffc7c56f1a95b9c