From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 11 Jan 2006 05:31:24 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.16-rc1~428
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05f6ece6f37f987e9de643f6f76e8fb5d5b9e014;p=linux-2.6

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

05f6ece6f37f987e9de643f6f76e8fb5d5b9e014