From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 18 Nov 2005 22:25:40 +0000 (-0800)
Subject: Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
X-Git-Tag: v2.6.15-rc2~16
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=62ae144f56b61f541193df4a6465c06ee7eb9096;p=linux-2.6-omap-h63xx.git

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

62ae144f56b61f541193df4a6465c06ee7eb9096