From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 29 Nov 2005 22:23:38 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v3.12-rc1~40104^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f12c74f0cfdc93e1d47ac70766e837ef29472fd;p=kernel%2Fkernel-generic.git

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

2f12c74f0cfdc93e1d47ac70766e837ef29472fd