From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 30 Sep 2005 15:43:13 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.14-rc3~33
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab;p=linux-2.6

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

c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab