Commit 08c191de authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v3.19-rc7' of... 

Merge tag 'asoc-fix-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.19

A few last minute fixes for v3.19, all driver specific.  None of them
stand out particularly - it's all the standard people who are affected
will care stuff.

The Samsung fix is a DT only fix for the audio controller, it's being
merged via the ASoC tree due to process messups (the submitter sent it
at the end of a tangentally related series rather than separately to the
ARM folks) in order to make sure that it gets to people sooner.
parents 4161b450 c503ca52

Documentation/devicetree/bindings/i2c/i2c-st.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ i2c0: i2c@fed40000 { 
	compatible	= "st,comms-ssc4-i2c";

	reg		= <0xfed40000 0x110>;

	interrupts	=  <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

	clocks		= <&CLK_S_ICN_REG_0>;

	clocks		= <&clk_s_a0_ls CLK_ICN_REG>;

	clock-names	= "ssc";

	clock-frequency = <400000>;

	pinctrl-names	= "default";

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ dallas,ds3232 Extremely Accurate I²C RTC with Integrated Crystal and SRAM 
dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O

dallas,ds75		Digital Thermometer and Thermostat

dlg,da9053		DA9053: flexible system level PMIC with multicore support

dlg,da9063		DA9063: system PMIC for quad-core application processors

epson,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE

epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE

fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

MAINTAINERS

+21 −0
Original line number Diff line number Diff line
@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd* 
F:	drivers/staging/iio/*/ad*

F:	staging/iio/trigger/iio-trig-bfin-timer.c



ANDROID DRIVERS

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

M:	Arve Hjønnevåg <arve@android.com>

M:	Riley Andrews <riandrews@android.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git

L:	devel@driverdev.osuosl.org

S:	Supported

F:	drivers/android/

F:	drivers/staging/android/



AOA (Apple Onboard Audio) ALSA DRIVER

M:	Johannes Berg <johannes@sipsolutions.net>

L:	linuxppc-dev@lists.ozlabs.org
@@ -4943,6 +4953,16 @@ F: Documentation/input/multi-touch-protocol.txt 
F:	drivers/input/input-mt.c

K:	\b(ABS|SYN)_MT_



INTEL ASoC BDW/HSW DRIVERS

M:	Jie Yang <yang.jie@linux.intel.com>

L:	alsa-devel@alsa-project.org

S:	Supported

F:	sound/soc/intel/sst-haswell*

F:	sound/soc/intel/sst-dsp*

F:	sound/soc/intel/sst-firmware.c

F:	sound/soc/intel/broadwell.c

F:	sound/soc/intel/haswell.c



INTEL C600 SERIES SAS CONTROLLER DRIVER

M:	Intel SCU Linux support <intel-linux-scu@intel.com>

M:	Artur Paszkiewicz <artur.paszkiewicz@intel.com>
@@ -10166,6 +10186,7 @@ USERSPACE I/O (UIO) 
M:	"Hans J. Koch" <hjk@hansjkoch.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

F:	Documentation/DocBook/uio-howto.tmpl

F:	drivers/uio/

F:	include/linux/uio*.h

Makefile

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

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Diseased Newt



# *DOCUMENTATION*

arch/alpha/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ retry: 
	if (unlikely(fault & VM_FAULT_ERROR)) {

		if (fault & VM_FAULT_OOM)

			goto out_of_memory;

		else if (fault & VM_FAULT_SIGSEGV)

			goto bad_area;

		else if (fault & VM_FAULT_SIGBUS)

			goto do_sigbus;

		BUG();

CRA Git | Maintained and supported by SUSTech CRA and CCSE