Skip to content

Commit

Permalink
Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/rspi'…
Browse files Browse the repository at this point in the history 
…, 'spi/topic/s3c64xx', 'spi/topic/sh-msiof' and 'spi/topic/slave' into spi-next
  • Loading branch information
Mark Brown committed Feb 19, 2017
6 parents 2016d52 + 23e291c + ffcfae3 + 72bc7ae + e7ad4a7 + c2e51ac commit e2a3b0d
Show file tree
Hide file tree
Showing 11,411 changed files with 756,421 additions and 270,102 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 4 additions & 2 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2775,6 +2775,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: jens@de.ibm.com
D: Maintainer of Spidernet network driver for Cell
Expand Down Expand Up @@ -3945,8 +3949,6 @@ E: gwingerde@gmail.com
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
Expand Down
Loading

0 comments on commit e2a3b0d

Please sign in to comment.