Merge v3.6-rc3 into 'char-misc-next'
This resolves a conflict in:
drivers/misc/mei/interrupt.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing
想要评论请 注册 或 登录
This resolves a conflict in:
drivers/misc/mei/interrupt.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>