tree 7e5745bea06675cfce60d6813ee3b4d5e19cbb56
parent 62d0cfcb27cf755cebdc93ca95dabc83608007cd
parent cb6efb39163bfb6bb6475fa7c8a5e08e44dbf14a
author Kyle McMartin <kyle@parisc-linux.org> 1171689503 -0500
committer Kyle McMartin <kyle@parisc-linux.org> 1171689503 -0500

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

Conflicts:

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