From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 25 Apr 2005 14:42:22 +0000 (-0700)
Subject: Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cf025109e879294f4c6aecf94de1e7b592a9fb07;p=deliverable%2Flinux.git

Merge ... /linux/kernel/git/davem/sparc-2.6.git
---

cf025109e879294f4c6aecf94de1e7b592a9fb07