Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ddc34f7

Browse files
authored
Merge pull request torvalds#335 from libos-nuse/v4.10-merge
Linux v4.10 merge
2 parents 43faa6e + b405804 commit ddc34f7

File tree

11,848 files changed

+771188
-276987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

11,848 files changed

+771188
-276987
lines changed

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <[email protected]>
137137
Rudolf Marek <[email protected]>
138138
Rui Saraiva <[email protected]>
139139
Sachin P Sant <[email protected]>
140+
Sarangdhar Joshi <[email protected]>
140141
Sam Ravnborg <[email protected]>
141142
Santosh Shilimkar <[email protected]>
142143
Santosh Shilimkar <[email protected]>
@@ -150,10 +151,13 @@ Shuah Khan <[email protected]> <[email protected]>
150151
Simon Kelley <[email protected]>
151152
Stéphane Witzmann <[email protected]>
152153
Stephen Hemminger <[email protected]>
154+
Subash Abhinov Kasiviswanathan <[email protected]>
155+
Subhash Jadavani <[email protected]>
153156
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
154157
Sumit Semwal <[email protected]>
155158
Tejun Heo <[email protected]>
156159
Thomas Graf <[email protected]>
160+
Thomas Pedersen <[email protected]>
157161
Tony Luck <[email protected]>
158162
Tsuneo Yoshioka <[email protected]>
159163
Uwe Kleine-König <[email protected]>

CREDITS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2478,12 +2478,11 @@ S: D-90453 Nuernberg
24782478
S: Germany
24792479

24802480
N: Arnaldo Carvalho de Melo
2481-
E: acme@ghostprotocols.net
2481+
E: acme@kernel.org
24822482
24832483
2484-
W: http://oops.ghostprotocols.net:81/blog/
24852484
P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
2486-
D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
2485+
D: tools/, IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
24872486
S: Brazil
24882487

24892488
N: Karsten Merker
@@ -2775,6 +2774,10 @@ S: C/ Mieses 20, 9-B
27752774
S: Valladolid 47009
27762775
S: Spain
27772776

2777+
N: Peter Oruba
2778+
D: AMD Microcode loader driver
2779+
S: Germany
2780+
27782781
N: Jens Osterkamp
27792782
27802783
D: Maintainer of Spidernet network driver for Cell
@@ -3945,8 +3948,6 @@ E: [email protected]
39453948
D: Ralink rt2x00 WLAN driver
39463949
D: Minix V2 file-system
39473950
D: Misc fixes
3948-
S: Geessinkweg 177
3949-
S: 7544 TX Enschede
39503951
S: The Netherlands
39513952

39523953
N: Lars Wirzenius

0 commit comments

Comments
 (0)