From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 1 Jun 2005 20:20:35 +0000 (-0700)
Subject: Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.12-rc6~34
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f9a22239257561df80ef54fc8f31880e2fb2a27b;p=linux-2.6-omap-h63xx.git

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
---

f9a22239257561df80ef54fc8f31880e2fb2a27b