From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 21 Dec 2005 01:33:54 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.15-rc7~13^2~1
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=b05948d9b7167e23af88cc65b9ffa4687eaf1f0d;p=safe%2Fjmp%2Flinux-2.6

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

b05948d9b7167e23af88cc65b9ffa4687eaf1f0d