From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 12 Nov 2005 20:23:25 +0000 (-0800)
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=9e6c67fd2716720d9029d38ea25884efcfdedeb6;p=linux-edison.git

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

9e6c67fd2716720d9029d38ea25884efcfdedeb6