From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 9 Jan 2006 23:10:22 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.16-rc1~659
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc6055060d975e8c7601f4a1c68ef2d3050b4e9;p=linux-2.6

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

2cc6055060d975e8c7601f4a1c68ef2d3050b4e9