]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cd1f9d 44549e8)
Merge 4.6-rc7 into char-misc-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:34:49 +0000 (09:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:34:49 +0000 (09:34 +0200)
This resolves a merge issue with drivers/hv/ring_buffer.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.