Skip to content

Commit

Permalink
Merge branch 'next' into for-linus
Browse files Browse the repository at this point in the history 
Prepare first set of updates for 3.10 merge window.
  • Loading branch information
@dtor
dtor committed May 1, 2013
2 parents 5846115 + 0c6a616 commit bf61c88
Show file tree
Hide file tree
Showing 17,369 changed files with 1,083,397 additions and 591,664 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ modules.builtin
# Generated include files
#
include/config
include/linux/version.h
include/generated
arch/*/include/generated

Expand Down
19 changes: 12 additions & 7 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,11 +953,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 @@ -1572,12 +1572,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 @@ -1823,6 +1823,11 @@ S: Kattreinstr 38
S: D-64295
S: Germany

N: Avi Kivity
E: [email protected]
D: Kernel-based Virtual Machine (KVM)
S: Ra'annana, Israel

N: Andi Kleen
E: [email protected]
U: http://www.halobates.de
Expand Down
Loading

0 comments on commit bf61c88

Please sign in to comment.