diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 14:09:18 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 14:09:18 +0300 |
commit | a2ab5fc41533c952706ebdfaa378bb746e535cc1 (patch) | |
tree | 9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f /.mailmap | |
parent | a380f2edef65b2447a043251bb3c00a9d2153a8b (diff) | |
parent | 0e708fc602531b8355b5de6ea7c98f09129b223f (diff) | |
download | linux-a2ab5fc41533c952706ebdfaa378bb746e535cc1.tar.xz |
Merge branch 'pm-sleep' into pm-core
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@amd.com> James Bottomley <jejb@mulgrave.(none)> James Bottomley <jejb@titanic.il.steeleye.com> James E Wilson <wilson@specifix.com> +James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> +James Hogan <jhogan@kernel.org> <james@albanarts.com> James Ketrenos <jketreno@io.(none)> Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com> <javier@osg.samsung.com> <javier.martinez@collabora.co.uk> |