From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 23 Dec 2005 18:11:50 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc7~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8f43d8e1147406901b7d972d1b528d94def23b0e;p=linux-2.6-omap-h63xx.git

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

8f43d8e1147406901b7d972d1b528d94def23b0e