From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 4 Feb 2006 02:17:47 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.16-rc3~205
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=89a2fa5f2139be35e214bcf86a8291d6a1da75f2;p=users%2Fhch%2Fblock.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
---

89a2fa5f2139be35e214bcf86a8291d6a1da75f2