Skip to content

Commit

Permalink
Merge pull request #1 from torvalds/master
Browse files Browse the repository at this point in the history
pull from torvalds
  • Loading branch information
mbin committed Jun 17, 2014
2 parents a56e160 + ebe0618 commit 02b5a60
Show file tree
Hide file tree
Showing 32,268 changed files with 4,252,159 additions and 1,796,547 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@
*.lst
*.symtypes
*.order
modules.builtin
*.elf
*.bin
*.gz
*.bz2
*.lzma
*.xz
*.lz4
*.lzo
*.patch
*.gcno
modules.builtin
Module.symvers

#
# Top-level generic files
Expand All @@ -43,7 +45,6 @@ modules.builtin
/vmlinuz
/System.map
/Module.markers
/Module.symvers

#
# Debian directory (make deb-pkg)
Expand Down Expand Up @@ -91,3 +92,6 @@ extra_certificates
signing_key.priv
signing_key.x509
x509.genkey

# Kconfig presets
all.config
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ Sachin P Sant <[email protected]>
Sam Ravnborg <[email protected]>
Sascha Hauer <[email protected]>
S.Çağlar Onur <[email protected]>
Shiraz Hashim <[email protected]> <[email protected]>
Simon Kelley <[email protected]>
Stéphane Witzmann <[email protected]>
Stephen Hemminger <[email protected]>
Expand Down
80 changes: 60 additions & 20 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -630,21 +630,27 @@ N: Michael Elizabeth Chastain
E: [email protected]
D: Configure, Menuconfig, xconfig

N: Mauro Carvalho Chehab
E: [email protected]
E: [email protected]
D: Media subsystem (V4L/DVB) drivers and core
D: EDAC drivers and EDAC 3.0 core rework
S: Brazil

N: Raymond Chen
E: [email protected]
D: Author of Configure script
S: 14509 NE 39th Street #1096
S: Bellevue, Washington 98007
S: USA

N: Christopher L. Cheney
E: [email protected]
E: [email protected]
W: http://www.cheney.cx
N: Chris Cheney
E: [email protected]
E: [email protected]
P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2
D: Vista Imaging usb webcam driver
S: 314 Prince of Wales
S: Conroe, TX 77304
S: 2308 Therrell Way
S: McKinney, TX 75070
S: USA

N: Stuart Cheshire
Expand All @@ -656,6 +662,11 @@ S: Stanford University
S: Stanford, California 94305
S: USA

N: Carlos Chinea
E: [email protected]
E: [email protected]
D: Author of HSI Subsystem

N: Randolph Chung
E: [email protected]
D: Linux/PA-RISC hacker
Expand Down Expand Up @@ -761,6 +772,10 @@ S: Northampton
S: NN1 3QT
S: United Kingdom

N: Massimo Dal Zotto
E: [email protected]
D: i8k Dell laptop SMM driver

N: Uwe Dannowski
E: [email protected]
W: http://i30www.ira.uka.de/~dannowsk/
Expand Down Expand Up @@ -815,8 +830,8 @@ S: D-69231 Rauenberg
S: Germany

N: Jean Delvare
E: [email protected]
W: http://khali.linux-fr.org/
E: [email protected]
W: http://jdelvare.nerim.net/
D: Several hardware monitoring drivers
S: France

Expand Down Expand Up @@ -953,11 +968,11 @@ S: Blacksburg, Virginia 24061
S: USA

N: Randy Dunlap
E: [email protected]
W: http://www.xenotime.net/linux/linux.html
W: http://www.linux-usb.org
E: [email protected]
W: http://www.infradead.org/~rdunlap/
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
D: x86 SMP, ACPI, bootflag hacking
D: documentation, builds
S: (ask for current address)
S: USA

Expand Down Expand Up @@ -1116,6 +1131,7 @@ D: author of userfs filesystem
D: Improved mmap and munmap handling
D: General mm minor tidyups
D: autofs v4 maintainer
D: Xen subsystem
S: 987 Alabama St
S: San Francisco
S: CA, 94110
Expand Down Expand Up @@ -1220,7 +1236,7 @@ E: [email protected]
D: Kernel / timekeeping stuff
S: Carlisle, MA 01741
S: USA

N: Jan-Benedict Glaw
E: [email protected]
D: SRM environment driver (for Alpha systems)
Expand Down Expand Up @@ -1510,6 +1526,14 @@ D: Natsemi ethernet
D: Cobalt Networks (x86) support
D: This-and-That

N: Mark M. Hoffman
E: [email protected]
D: asb100, lm93 and smsc47b397 hardware monitoring drivers
D: hwmon subsystem core
D: hwmon subsystem maintainer
D: i2c-sis96x and i2c-stub SMBus drivers
S: USA

N: Dirk Hohndel
E: [email protected]
D: The XFree86[tm] Project
Expand Down Expand Up @@ -1572,12 +1596,12 @@ S: Wantage, New Jersey 07461
S: USA

N: Harald Hoyer
E: harald[email protected]
W: http://parzelle.de/
E: harald@redhat.com
W: http://www.harald-hoyer.de
D: ip_masq_quake
D: md boot support
S: Hohe Strasse 30
S: D-70176 Stuttgart
S: Am Strand 5
S: D-19063 Schwerin
S: Germany

N: Jan Hubicka
Expand Down Expand Up @@ -2543,10 +2567,14 @@ S: 22 Seaview St
S: Fullarton 5063
S: South Australia

N. Wolfgang Muees
N: Wolfgang Muees
E: [email protected]
D: Auerswald USB driver

N: Paul Mundt
E: [email protected]
D: SuperH maintainer

N: Ian A. Murdock
E: [email protected]
D: Creator of Debian distribution
Expand All @@ -2564,7 +2592,7 @@ S: Toronto, Ontario
S: Canada

N: Zwane Mwaikambo
E: [email protected]
E: [email protected]
D: Various driver hacking
D: Lowlevel x86 kernel hacking
D: General debugging
Expand Down Expand Up @@ -2690,6 +2718,9 @@ N: Greg Page
E: [email protected]
D: IPX development and support

N: Venkatesh Pallipadi (Venki)
D: x86/HPET

N: David Parsons
E: [email protected]
D: improved memory detection code.
Expand Down Expand Up @@ -2796,8 +2827,7 @@ S: Ottawa, Ontario
S: Canada K2P 0X8

N: Mikael Pettersson
E: [email protected]
W: http://user.it.uu.se/~mikpe/linux/
E: [email protected]
D: Miscellaneous fixes

N: Reed H. Petty
Expand Down Expand Up @@ -2884,6 +2914,11 @@ S: Framewood Road
S: Wexham SL3 6PJ
S: United Kingdom

N: Richard Purdie
E: [email protected]
D: Backlight subsystem maintainer
S: United Kingdom

N: Daniel Quinlan
E: [email protected]
W: http://www.pathname.com/~quinlan/
Expand Down Expand Up @@ -3141,6 +3176,11 @@ N: Dipankar Sarma
E: [email protected]
D: RCU

N: Yoshinori Sato
E: [email protected]
D: uClinux for Renesas H8/300 (H8300)
D: http://uclinux-h8.sourceforge.jp/

N: Hannu Savolainen
E: [email protected]
D: Maintainer of the sound drivers until 2.1.x days.
Expand Down
Loading

0 comments on commit 02b5a60

Please sign in to comment.