Merge branch 'topic/snd-device' into for-next (3fe9cf39) · Commits · e / devices / android_kernel_teracube_2e

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";

+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

+11 −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
		@@ -10166,6 +10176,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

+1 −1

+2 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
		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();