• D
    Manual merge with Linus. · 95d465fd
    Dmitry Torokhov 提交于
    Conflicts:
    	arch/powerpc/kernel/setup-common.c
    	drivers/input/keyboard/hil_kbd.c
    	drivers/input/mouse/hil_ptr.c
    95d465fd
Kconfig 45.9 KB