forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v3.7' into stable/for-linus-3.8
Linux 3.7 * tag 'v3.7': (833 commits) Linux 3.7 Input: matrix-keymap - provide proper module license Revert "revert "Revert "mm: remove __GFP_NO_KSWAPD""" and associated damage ipv4: ip_check_defrag must not modify skb before unsharing Revert "mm: avoid waking kswapd for THP allocations when compaction is deferred or contended" inet_diag: validate port comparison byte code to prevent unsafe reads inet_diag: avoid unsafe and nonsensical prefix matches in inet_diag_bc_run() inet_diag: validate byte code to prevent oops in inet_diag_bc_run() inet_diag: fix oops for IPv4 AF_INET6 TCP SYN-RECV state mm: vmscan: fix inappropriate zone congestion clearing vfs: fix O_DIRECT read past end of block device net: gro: fix possible panic in skb_gro_receive() tcp: bug fix Fast Open client retransmission tmpfs: fix shared mempolicy leak mm: vmscan: do not keep kswapd looping forever due to individual uncompactable zones mm: compaction: validate pfn range passed to isolate_freepages_block mmc: sh-mmcif: avoid oops on spurious interrupts (second try) Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts" mmc: sdhci-s3c: fix missing clock for gpio card-detect lib/Makefile: Fix oid_registry build dependency ... Signed-off-by: Konrad Rzeszutek Wilk <[email protected]> Conflicts: arch/arm/xen/enlighten.c drivers/xen/Makefile [We need to have the v3.7 base as the 'for-3.8' was based off v3.7-rc3 and there are some patches in v3.7-rc6 that we to have in our branch]
- Loading branch information
Showing
851 changed files
with
9,301 additions
and
5,507 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
* EETI eGalax Multiple Touch Controller | ||
|
||
Required properties: | ||
- compatible: must be "eeti,egalax_ts" | ||
- reg: i2c slave address | ||
- interrupt-parent: the phandle for the interrupt controller | ||
- interrupts: touch controller interrupt | ||
- wakeup-gpios: the gpio pin to be used for waking up the controller | ||
as well as uased as irq pin | ||
|
||
Example: | ||
|
||
egalax_ts@04 { | ||
compatible = "eeti,egalax_ts"; | ||
reg = <0x04>; | ||
interrupt-parent = <&gpio1>; | ||
interrupts = <9 2>; | ||
wakeup-gpios = <&gpio1 9 0>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -503,7 +503,7 @@ F: include/linux/altera_uart.h | |
F: include/linux/altera_jtaguart.h | ||
|
||
AMD FAM15H PROCESSOR POWER MONITORING DRIVER | ||
M: Andreas Herrmann <andreas.herrmann3@amd.com> | ||
M: Andreas Herrmann <herrmann.der.user@googlemail.com> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/hwmon/fam15h_power | ||
|
@@ -526,17 +526,17 @@ F: drivers/video/geode/ | |
F: arch/x86/include/asm/geode.h | ||
|
||
AMD IOMMU (AMD-VI) | ||
M: Joerg Roedel <[email protected]> | ||
M: Joerg Roedel <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git | ||
S: Supported | ||
S: Maintained | ||
F: drivers/iommu/amd_iommu*.[ch] | ||
F: include/linux/amd-iommu.h | ||
|
||
AMD MICROCODE UPDATE SUPPORT | ||
M: Andreas Herrmann <andreas.herrmann3@amd.com> | ||
M: Andreas Herrmann <herrmann.der.user@googlemail.com> | ||
L: [email protected] | ||
S: Supported | ||
S: Maintained | ||
F: arch/x86/kernel/microcode_amd.c | ||
|
||
AMS (Apple Motion Sensor) DRIVER | ||
|
@@ -841,6 +841,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git | |
F: arch/arm/mach-sa1100/jornada720.c | ||
F: arch/arm/mach-sa1100/include/mach/jornada720.h | ||
|
||
ARM/IGEP MACHINE SUPPORT | ||
M: Enric Balletbo i Serra <[email protected]> | ||
M: Javier Martinez Canillas <[email protected]> | ||
L: [email protected] | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: arch/arm/mach-omap2/board-igep0020.c | ||
|
||
ARM/INCOME PXA270 SUPPORT | ||
M: Marek Vasut <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
|
@@ -2507,6 +2515,7 @@ M: Joonyoung Shim <[email protected]> | |
M: Seung-Woo Kim <[email protected]> | ||
M: Kyungmin Park <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git | ||
S: Supported | ||
F: drivers/gpu/drm/exynos | ||
F: include/drm/exynos* | ||
|
@@ -2707,10 +2716,10 @@ F: include/linux/edac.h | |
|
||
EDAC-AMD64 | ||
M: Doug Thompson <[email protected]> | ||
M: Borislav Petkov <[email protected]> | ||
M: Borislav Petkov <[email protected]> | ||
L: [email protected] | ||
W: bluesmoke.sourceforge.net | ||
S: Supported | ||
S: Maintained | ||
F: drivers/edac/amd64_edac* | ||
|
||
EDAC-E752X | ||
|
@@ -3597,16 +3606,58 @@ F: drivers/hid/hid-hyperv.c | |
F: drivers/net/hyperv/ | ||
F: drivers/staging/hv/ | ||
|
||
I2C OVER PARALLEL PORT | ||
M: Jean Delvare <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/i2c/busses/i2c-parport | ||
F: Documentation/i2c/busses/i2c-parport-light | ||
F: drivers/i2c/busses/i2c-parport.c | ||
F: drivers/i2c/busses/i2c-parport-light.c | ||
|
||
I2C/SMBUS CONTROLLER DRIVERS FOR PC | ||
M: Jean Delvare <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/i2c/busses/i2c-ali1535 | ||
F: Documentation/i2c/busses/i2c-ali1563 | ||
F: Documentation/i2c/busses/i2c-ali15x3 | ||
F: Documentation/i2c/busses/i2c-amd756 | ||
F: Documentation/i2c/busses/i2c-amd8111 | ||
F: Documentation/i2c/busses/i2c-i801 | ||
F: Documentation/i2c/busses/i2c-nforce2 | ||
F: Documentation/i2c/busses/i2c-piix4 | ||
F: Documentation/i2c/busses/i2c-sis5595 | ||
F: Documentation/i2c/busses/i2c-sis630 | ||
F: Documentation/i2c/busses/i2c-sis96x | ||
F: Documentation/i2c/busses/i2c-via | ||
F: Documentation/i2c/busses/i2c-viapro | ||
F: drivers/i2c/busses/i2c-ali1535.c | ||
F: drivers/i2c/busses/i2c-ali1563.c | ||
F: drivers/i2c/busses/i2c-ali15x3.c | ||
F: drivers/i2c/busses/i2c-amd756.c | ||
F: drivers/i2c/busses/i2c-amd756-s4882.c | ||
F: drivers/i2c/busses/i2c-amd8111.c | ||
F: drivers/i2c/busses/i2c-i801.c | ||
F: drivers/i2c/busses/i2c-isch.c | ||
F: drivers/i2c/busses/i2c-nforce2.c | ||
F: drivers/i2c/busses/i2c-nforce2-s4985.c | ||
F: drivers/i2c/busses/i2c-piix4.c | ||
F: drivers/i2c/busses/i2c-sis5595.c | ||
F: drivers/i2c/busses/i2c-sis630.c | ||
F: drivers/i2c/busses/i2c-sis96x.c | ||
F: drivers/i2c/busses/i2c-via.c | ||
F: drivers/i2c/busses/i2c-viapro.c | ||
|
||
I2C/SMBUS STUB DRIVER | ||
M: "Mark M. Hoffman" <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/i2c/busses/i2c-stub.c | ||
|
||
I2C SUBSYSTEM | ||
M: "Jean Delvare (PC drivers, core)" <[email protected]> | ||
M: Wolfram Sang <[email protected]> | ||
M: "Ben Dooks (embedded platforms)" <[email protected]> | ||
M: "Wolfram Sang (embedded platforms)" <[email protected]> | ||
L: [email protected] | ||
W: http://i2c.wiki.kernel.org/ | ||
T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ | ||
|
@@ -3617,6 +3668,13 @@ F: drivers/i2c/ | |
F: include/linux/i2c.h | ||
F: include/linux/i2c-*.h | ||
|
||
I2C-TAOS-EVM DRIVER | ||
M: Jean Delvare <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/i2c/busses/i2c-taos-evm | ||
F: drivers/i2c/busses/i2c-taos-evm.c | ||
|
||
I2C-TINY-USB DRIVER | ||
M: Till Harbaum <[email protected]> | ||
L: [email protected] | ||
|
@@ -3703,7 +3761,7 @@ S: Maintained | |
F: drivers/platform/x86/ideapad-laptop.c | ||
|
||
IDE/ATAPI DRIVERS | ||
M: Borislav Petkov <[email protected]> | ||
M: Borislav Petkov <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/cdrom/ide-cd | ||
|
@@ -4230,8 +4288,8 @@ F: include/linux/lockd/ | |
F: include/linux/sunrpc/ | ||
|
||
KERNEL VIRTUAL MACHINE (KVM) | ||
M: Avi Kivity <[email protected]> | ||
M: Marcelo Tosatti <[email protected]> | ||
M: Gleb Natapov <[email protected]> | ||
L: [email protected] | ||
W: http://kvm.qumranet.com | ||
S: Supported | ||
|
@@ -5363,7 +5421,7 @@ S: Maintained | |
F: sound/drivers/opl4/ | ||
|
||
OPROFILE | ||
M: Robert Richter <[email protected]> | ||
M: Robert Richter <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: arch/*/include/asm/oprofile*.h | ||
|
@@ -5647,7 +5705,7 @@ S: Maintained | |
F: drivers/pinctrl/spear/ | ||
|
||
PKTCDVD DRIVER | ||
M: Peter Osterlund <[email protected]> | ||
M: Jiri Kosina <[email protected]> | ||
S: Maintained | ||
F: drivers/block/pktcdvd.c | ||
F: include/linux/pktcdvd.h | ||
|
@@ -7209,6 +7267,14 @@ L: [email protected] | |
S: Maintained | ||
F: arch/xtensa/ | ||
|
||
THERMAL | ||
M: Zhang Rui <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git | ||
S: Supported | ||
F: drivers/thermal/ | ||
F: include/linux/thermal.h | ||
|
||
THINKPAD ACPI EXTRAS DRIVER | ||
M: Henrique de Moraes Holschuh <[email protected]> | ||
L: [email protected] | ||
|
@@ -7886,13 +7952,6 @@ M: Roger Luethi <[email protected]> | |
S: Maintained | ||
F: drivers/net/ethernet/via/via-rhine.c | ||
|
||
VIAPRO SMBUS DRIVER | ||
M: Jean Delvare <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/i2c/busses/i2c-viapro | ||
F: drivers/i2c/busses/i2c-viapro.c | ||
|
||
VIA SD/MMC CARD CONTROLLER DRIVER | ||
M: Bruce Chang <[email protected]> | ||
M: Harald Welte <[email protected]> | ||
|
@@ -8147,7 +8206,7 @@ F: drivers/platform/x86 | |
|
||
X86 MCE INFRASTRUCTURE | ||
M: Tony Luck <[email protected]> | ||
M: Borislav Petkov <bp@amd64.org> | ||
M: Borislav Petkov <bp@alien8.de> | ||
L: [email protected] | ||
S: Maintained | ||
F: arch/x86/kernel/cpu/mcheck/* | ||
|
Oops, something went wrong.