summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 07:29:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 07:29:44 -0700
commit194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch)
tree86d926b7407c33379dd719fad2ccaf03d5c5228a /usr
parentc0ff9019ee64101fda8f19338da799fda8217e14 (diff)
parent33688abb2802ff3a230bd2441f765477b94cc89e (diff)
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions