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

Commit 94aca808 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso 



Resolved Conflicts:
	arch/x86/vdso/vdso32-setup.c

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents 03c1b4e8 368b69a5

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example 
		clock-output-names =

			"tpu0", "mmcif1", "sdhi3", "sdhi2",

			 "sdhi1", "sdhi0", "mmcif0";

		renesas,clock-indices = <

		clock-indices = <

			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3

			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0

			R8A7790_CLK_MMCIF0

MAINTAINERS

+3 −6
Original line number Diff line number Diff line
@@ -2246,12 +2246,6 @@ L: linux-usb@vger.kernel.org 
S:	Maintained

F:	drivers/usb/host/ohci-ep93xx.c



CIRRUS LOGIC CS4270 SOUND DRIVER

M:	Timur Tabi <timur@tabi.org>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Odd Fixes

F:	sound/soc/codecs/cs4270*



CIRRUS LOGIC AUDIO CODEC DRIVERS

M:	Brian Austin <brian.austin@cirrus.com>

M:	Paul Handrigan <Paul.Handrigan@cirrus.com>
@@ -9116,6 +9110,9 @@ F: arch/um/os-Linux/drivers/ 


TURBOCHANNEL SUBSYSTEM

M:	"Maciej W. Rozycki" <macro@linux-mips.org>

M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-mips@linux-mips.org

Q:	http://patchwork.linux-mips.org/project/linux-mips/list/

S:	Maintained

F:	drivers/tc/

F:	include/linux/tc.h

Makefile

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

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

arch/arm/boot/dts/imx53-mba53.dts

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ 
&tve {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_vga_sync_1>;

	i2c-ddc-bus = <&i2c3>;

	ddc-i2c-bus = <&i2c3>;

	fsl,tve-mode = "vga";

	fsl,hsync-pin = <4>;

	fsl,vsync-pin = <6>;