Skip to content
Commit e7b3ca08 authored by Kyle McMartin's avatar Kyle McMartin
Browse files

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

Conflicts:

	arch/parisc/hpux/sys_hpux.c
	arch/parisc/mm/ioremap.c
parents 62d0cfcb cb6efb39
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment