Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts: arch/parisc/hpux/sys_hpux.c arch/parisc/mm/ioremap.c
Showing
arch/parisc/mm/kmap.c
已删除
100644 → 0
想要评论请 注册 或 登录
Conflicts: arch/parisc/hpux/sys_hpux.c arch/parisc/mm/ioremap.c