From: Kyle McMartin <kyle@parisc-linux.org>
Date: Sat, 17 Feb 2007 05:18:23 +0000 (-0500)
Subject: Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
X-Git-Tag: v2.6.21-rc2~35^2~47
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7;p=pandora-kernel.git

Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

Conflicts:

	arch/parisc/hpux/sys_hpux.c
	arch/parisc/mm/ioremap.c
---

e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7
Reading git-diff-tree failed