From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 18 Nov 2005 01:26:56 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc2~38
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=811803c5572b296e0031e0099203de90d77c7bcf;p=linux-2.6-omap-h63xx.git

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

811803c5572b296e0031e0099203de90d77c7bcf