From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 31 Jan 2006 18:20:49 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v3.12-rc1~39017
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7dd16bf3a2e7e29670051a2488d4be1895e408d;p=kernel%2Fkernel-generic.git

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

f7dd16bf3a2e7e29670051a2488d4be1895e408d