From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 16 Nov 2005 16:25:28 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc2~73
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db169f9703115bab09eda5d89a8f6937a7bf98e;p=linux-2.6

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

0db169f9703115bab09eda5d89a8f6937a7bf98e