Commits

Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git Conflicts: arch/parisc/hpux/sys_hpux.c arch/parisc/mm/ioremap.c
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git Conflicts: arch/parisc/hpux/sys_hpux.c arch/parisc/mm/ioremap.c