Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa8e2458 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge tag 'v3.7-rc4' into next to sync up Wacom bits 

Linux 3.7-rc4
parents d56a289b 3d70f8c6

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* 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>;

	};

Documentation/hwmon/fam15h_power

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Supported chips: 
  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors

    (not yet published)



Author: Andreas Herrmann <andreas.herrmann3@amd.com>

Author: Andreas Herrmann <herrmann.der.user@googlemail.com>



Description

-----------

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -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:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/fam15h_power
@@ -2507,6 +2507,7 @@ M: Joonyoung Shim <jy0922.shim@samsung.com> 
M:	Seung-Woo Kim <sw0312.kim@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

L:	dri-devel@lists.freedesktop.org

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*
@@ -5647,7 +5648,7 @@ S: Maintained 
F:	drivers/pinctrl/spear/



PKTCDVD DRIVER

M:	Peter Osterlund <petero2@telia.com>

M:	Jiri Kosina <jkosina@suse.cz>

S:	Maintained

F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 7

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Terrified Chipmunk



# *DOCUMENTATION*

arch/arm/xen/hypercall.S

+5 −9
Original line number Diff line number Diff line
@@ -48,20 +48,16 @@ 


#include <linux/linkage.h>

#include <asm/assembler.h>

#include <asm/opcodes-virt.h>

#include <xen/interface/xen.h>





/* HVC 0xEA1 */

#ifdef CONFIG_THUMB2_KERNEL

#define xen_hvc .word 0xf7e08ea1

#else

#define xen_hvc .word 0xe140ea71

#endif

#define XEN_IMM 0xEA1



#define HYPERCALL_SIMPLE(hypercall)		\

ENTRY(HYPERVISOR_##hypercall)			\

	mov r12, #__HYPERVISOR_##hypercall;	\

	xen_hvc;							\

	__HVC(XEN_IMM);						\

	mov pc, lr;							\

ENDPROC(HYPERVISOR_##hypercall)
@@ -76,7 +72,7 @@ ENTRY(HYPERVISOR_##hypercall) \ 
	stmdb sp!, {r4}						\

	ldr r4, [sp, #4]					\

	mov r12, #__HYPERVISOR_##hypercall;	\

	xen_hvc								\

	__HVC(XEN_IMM);						\

	ldm sp!, {r4}						\

	mov pc, lr							\

ENDPROC(HYPERVISOR_##hypercall)
@@ -100,7 +96,7 @@ ENTRY(privcmd_call) 
	mov r2, r3

	ldr r3, [sp, #8]

	ldr r4, [sp, #4]

	xen_hvc

	__HVC(XEN_IMM)

	ldm sp!, {r4}

	mov pc, lr

ENDPROC(privcmd_call);