Merge 4.3-rc7 into usb-next (0bbc367e) · Commits · e / devices / android_kernel_xiaomi_nabu

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,7 @@ James Bottomley <jejb@mulgrave.(none)>
	James Bottomley <jejb@titanic.il.steeleye.com>		James Bottomley <jejb@titanic.il.steeleye.com>
	James E Wilson <wilson@specifix.com>		James E Wilson <wilson@specifix.com>
	James Ketrenos <jketreno@io.(none)>		James Ketrenos <jketreno@io.(none)>
			<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
	Jean Tourrilhes <jt@hpl.hp.com>		Jean Tourrilhes <jt@hpl.hp.com>
	Jeff Garzik <jgarzik@pretzel.yyz.us>		Jeff Garzik <jgarzik@pretzel.yyz.us>
	Jens Axboe <axboe@suse.de>		Jens Axboe <axboe@suse.de>

Documentation/arm/OMAP/README

0 → 100644

+7 −0

Original line number	Original line	Diff line number	Diff line
			This file contains documentation for running mainline
			kernel on omaps.

			KERNEL NEW DEPENDENCIES
			v4.3+ Update is needed for custom .config files to make sure
			CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work
			properly.

MAINTAINERS

+28 −3

Original line number	Original line	Diff line number	Diff line
	@@ -894,11 +894,12 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained		S: Maintained

	ARM/Allwinner A1X SoC support		ARM/Allwinner sunXi SoC support
	M: Maxime Ripard <maxime.ripard@free-electrons.com>		M: Maxime Ripard <maxime.ripard@free-electrons.com>
			M: Chen-Yu Tsai <wens@csie.org>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	N: sun[x4567]i		N: sun[x456789]i

	ARM/Allwinner SoC Clock Support		ARM/Allwinner SoC Clock Support
	M: Emilio López <emilio@elopez.com.ar>		M: Emilio López <emilio@elopez.com.ar>
	@@ -3598,6 +3599,13 @@ F: drivers/gpu/drm/i915/
	F: include/drm/i915*		F: include/drm/i915*
	F: include/uapi/drm/i915*		F: include/uapi/drm/i915*

			DRM DRIVERS FOR ATMEL HLCDC
			M: Boris Brezillon <boris.brezillon@free-electrons.com>
			L: dri-devel@lists.freedesktop.org
			S: Supported
			F: drivers/gpu/drm/atmel-hlcdc/
			F: Documentation/devicetree/bindings/drm/atmel/

	DRM DRIVERS FOR EXYNOS		DRM DRIVERS FOR EXYNOS
	M: Inki Dae <inki.dae@samsung.com>		M: Inki Dae <inki.dae@samsung.com>
	M: Joonyoung Shim <jy0922.shim@samsung.com>		M: Joonyoung Shim <jy0922.shim@samsung.com>
	@@ -3626,6 +3634,14 @@ S: Maintained
	F: drivers/gpu/drm/imx/		F: drivers/gpu/drm/imx/
	F: Documentation/devicetree/bindings/drm/imx/		F: Documentation/devicetree/bindings/drm/imx/

			DRM DRIVERS FOR GMA500 (Poulsbo, Moorestown and derivative chipsets)
			M: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
			L: dri-devel@lists.freedesktop.org
			T: git git://github.com/patjak/drm-gma500
			S: Maintained
			F: drivers/gpu/drm/gma500
			F: include/drm/gma500*

	DRM DRIVERS FOR NVIDIA TEGRA		DRM DRIVERS FOR NVIDIA TEGRA
	M: Thierry Reding <thierry.reding@gmail.com>		M: Thierry Reding <thierry.reding@gmail.com>
	M: Terje Bergström <tbergstrom@nvidia.com>		M: Terje Bergström <tbergstrom@nvidia.com>
	@@ -6785,7 +6801,6 @@ F: drivers/scsi/megaraid/

	MELLANOX ETHERNET DRIVER (mlx4_en)		MELLANOX ETHERNET DRIVER (mlx4_en)
	M: Amir Vadai <amirv@mellanox.com>		M: Amir Vadai <amirv@mellanox.com>
	M: Ido Shamay <idos@mellanox.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Supported
	W: http://www.mellanox.com		W: http://www.mellanox.com
	@@ -9108,6 +9123,15 @@ S: Supported
	F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt		F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
	F: drivers/net/ethernet/synopsys/dwc_eth_qos.c		F: drivers/net/ethernet/synopsys/dwc_eth_qos.c

			SYNOPSYS DESIGNWARE I2C DRIVER
			M: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
			M: Jarkko Nikula <jarkko.nikula@linux.intel.com>
			M: Mika Westerberg <mika.westerberg@linux.intel.com>
			L: linux-i2c@vger.kernel.org
			S: Maintained
			F: drivers/i2c/busses/i2c-designware-*
			F: include/linux/platform_data/i2c-designware.h

	SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER		SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
	M: Seungwon Jeon <tgih.jun@samsung.com>		M: Seungwon Jeon <tgih.jun@samsung.com>
	M: Jaehoon Chung <jh80.chung@samsung.com>		M: Jaehoon Chung <jh80.chung@samsung.com>
	@@ -11658,6 +11682,7 @@ F: drivers/tty/serial/zs.*
	ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR		ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
	M: Minchan Kim <minchan@kernel.org>		M: Minchan Kim <minchan@kernel.org>
	M: Nitin Gupta <ngupta@vflare.org>		M: Nitin Gupta <ngupta@vflare.org>
			R: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
	L: linux-mm@kvack.org		L: linux-mm@kvack.org
	S: Maintained		S: Maintained
	F: mm/zsmalloc.c		F: mm/zsmalloc.c

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 3		PATCHLEVEL = 3
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc5		EXTRAVERSION = -rc7
	NAME = Blurry Fish Butt		NAME = Blurry Fish Butt

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/boot/dts/am57xx-beagle-x15.dts

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -402,11 +402,12 @@
	/* SMPS9 unused */		/* SMPS9 unused */

	ldo1_reg: ldo1 {		ldo1_reg: ldo1 {
	/* VDD_SD */		/* VDD_SD / VDDSHV8 */
	regulator-name = "ldo1";		regulator-name = "ldo1";
	regulator-min-microvolt = <1800000>;		regulator-min-microvolt = <1800000>;
	regulator-max-microvolt = <3300000>;		regulator-max-microvolt = <3300000>;
	regulator-boot-on;		regulator-boot-on;
			regulator-always-on;
	};		};

	ldo2_reg: ldo2 {		ldo2_reg: ldo2 {