Merge pull request torvalds#335 from libos-nuse/v4.10-merge

Linux v4.10 merge

.mailmap

@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <[email protected]>
 Rudolf Marek <[email protected]>
 Rui Saraiva <[email protected]>
 Sachin P Sant <[email protected]>
+Sarangdhar Joshi <[email protected]>
 Sam Ravnborg <[email protected]>
 Santosh Shilimkar <[email protected]>
 Santosh Shilimkar <[email protected]>
@@ -150,10 +151,13 @@ Shuah Khan <[email protected]> <[email protected]>
 Simon Kelley <[email protected]>
 Stéphane Witzmann <[email protected]>
 Stephen Hemminger <[email protected]>
+Subash Abhinov Kasiviswanathan <[email protected]>
+Subhash Jadavani <[email protected]>
 Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
 Sumit Semwal <[email protected]>
 Tejun Heo <[email protected]>
 Thomas Graf <[email protected]>
+Thomas Pedersen <[email protected]>
 Tony Luck <[email protected]>
 Tsuneo Yoshioka <[email protected]>
 Uwe Kleine-König <[email protected]>

CREDITS

@@ -2478,12 +2478,11 @@ S: D-90453 Nuernberg
 S: Germany
 
 N: Arnaldo Carvalho de Melo
-E: acme@ghostprotocols.net
+E: acme@kernel.org
 E: [email protected]
 E: [email protected]
-W: http://oops.ghostprotocols.net:81/blog/
 P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01
-D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
+D: tools/, IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
 S: Brazil
 
 N: Karsten Merker
@@ -2775,6 +2774,10 @@ S: C/ Mieses 20, 9-B
 S: Valladolid 47009
 S: Spain
 
+N: Peter Oruba
+D: AMD Microcode loader driver
+S: Germany
+
 N: Jens Osterkamp
 E: [email protected]
 D: Maintainer of Spidernet network driver for Cell
@@ -3945,8 +3948,6 @@ E: [email protected]
 D: Ralink rt2x00 WLAN driver
 D: Minix V2 file-system
 D: Misc fixes
-S: Geessinkweg 177
-S: 7544 TX Enschede
 S: The Netherlands
 
 N: Lars Wirzenius