From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Sep 2005 22:55:33 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.14-rc1~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9401c705f2a6a7e5df102f6443dba395c3c5e5a8;p=linux-2.6

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

9401c705f2a6a7e5df102f6443dba395c3c5e5a8