From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Dec 2005 00:43:57 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc7~16^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=546ac8a63186a06e5d21778eefa4695232aee5b8;p=linux-2.6

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

546ac8a63186a06e5d21778eefa4695232aee5b8