Skip to content

Commit 688d794

Browse files
committed
Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and devm_ioremap_resource().
2 parents 1614265 + a937536 commit 688d794

17,348 files changed

Lines changed: 1080737 additions & 591285 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ modules.builtin
6060
# Generated include files
6161
#
6262
include/config
63-
include/linux/version.h
6463
include/generated
6564
arch/*/include/generated
6665

CREDITS

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061
953953
S: USA
954954

955955
N: Randy Dunlap
956-
E: rdunlap@xenotime.net
957-
W: http://www.xenotime.net/linux/linux.html
958-
W: http://www.linux-usb.org
956+
E: rdunlap@infradead.org
957+
W: http://www.infradead.org/~rdunlap/
959958
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
960959
D: x86 SMP, ACPI, bootflag hacking
960+
D: documentation, builds
961961
S: (ask for current address)
962962
S: USA
963963

@@ -1572,12 +1572,12 @@ S: Wantage, New Jersey 07461
15721572
S: USA
15731573

15741574
N: Harald Hoyer
1575-
E: harald.hoyer@parzelle.de
1576-
W: http://parzelle.de/
1575+
E: harald@redhat.com
1576+
W: http://www.harald-hoyer.de
15771577
D: ip_masq_quake
15781578
D: md boot support
1579-
S: Hohe Strasse 30
1580-
S: D-70176 Stuttgart
1579+
S: Am Strand 5
1580+
S: D-19063 Schwerin
15811581
S: Germany
15821582

15831583
N: Jan Hubicka
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38
18231823
S: D-64295
18241824
S: Germany
18251825

1826+
N: Avi Kivity
1827+
E: avi.kivity@gmail.com
1828+
D: Kernel-based Virtual Machine (KVM)
1829+
S: Ra'annana, Israel
1830+
18261831
N: Andi Kleen
18271832
E: andi@firstfloor.org
18281833
U: http://www.halobates.de

0 commit comments

Comments
 (0)