From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 18 Aug 2005 21:57:53 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=f3ed8b444781158c9c10f48a8eba6795ecec7023;p=linux-edison.git

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
---

f3ed8b444781158c9c10f48a8eba6795ecec7023