aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-22 08:58:50 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-22 08:58:50 +0200
commit639e1c739bf53814b67a1d5f945d76fd4358453c (patch)
treed3bad09907d05228851267b1ddd3ba3a6fd39fe0 /.mailmap
parentstaging: greybus: mark PM functions as __maybe_unused (diff)
parentLinux 4.12-rc2 (diff)
downloadlinux-dev-639e1c739bf53814b67a1d5f945d76fd4358453c.tar.xz
linux-dev-639e1c739bf53814b67a1d5f945d76fd4358453c.zip
Merge 4.12-rc2 into staging-next
We want the staging tree fixes in here as well to handle the merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions