From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 24 Dec 2005 20:32:55 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc7~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=10bb10dcb685cbe078e611f2dca3bd3e42fba0a8;p=linux-2.6-omap-h63xx.git

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

10bb10dcb685cbe078e611f2dca3bd3e42fba0a8