Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
Pull PARISC changes from James Bottomley: "This is a couple of high code motion patches (all within arch/parisc) I'd like to apply at -rc1 to avoid conflicts with anything else. One moves us on to the generated instead of included asm file model and the other is a pull request from David Howells for UAPI disintegration. Signed-off-by: James Bottomley <JBottomley@Parallels.com>" * tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: UAPI: (Scripted) Disintegrate arch/parisc/include/asm [PARISC] asm: redo generic includes
Showing
arch/parisc/include/asm/vga.h
已删除
100644 → 0
arch/parisc/include/asm/xor.h
已删除
100644 → 0
文件已移动
文件已移动
文件已移动
文件已移动
此差异已折叠。
想要评论请 注册 或 登录