Merge 3.0-rc2 + Linus's latest into usb-linus (7e24cf43) · Commits · e / devices / android_kernel_xiaomi_markw

CREDITS

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -518,6 +518,14 @@ N: Zach Brown
	E: zab@zabbo.net		E: zab@zabbo.net
	D: maestro pci sound		D: maestro pci sound

			M: David Brownell
			D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
			D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
			D: device drivers. His encouragement also helped many engineers get
			D: started working on the Linux kernel. David passed away in early
			D: 2011, and will be greatly missed.
			W: https://lkml.org/lkml/2011/4/5/36

	N: Gary Brubaker		N: Gary Brubaker
	E: xavyer@ix.netcom.com		E: xavyer@ix.netcom.com
	D: USB Serial Empeg Empeg-car Mark I/II Driver		D: USB Serial Empeg Empeg-car Mark I/II Driver

MAINTAINERS

+4 −10

Original line number	Original line	Diff line number	Diff line
	@@ -4252,8 +4252,7 @@ F: drivers/mmc/
	F: include/linux/mmc/		F: include/linux/mmc/

	MULTIMEDIA CARD (MMC) ETC. OVER SPI		MULTIMEDIA CARD (MMC) ETC. OVER SPI
	M: David Brownell <dbrownell@users.sourceforge.net>		S: Orphan
	S: Odd Fixes
	F: drivers/mmc/host/mmc_spi.c		F: drivers/mmc/host/mmc_spi.c
	F: include/linux/spi/mmc_spi.h		F: include/linux/spi/mmc_spi.h

	@@ -4603,7 +4602,6 @@ F: drivers/media/video/omap3isp/*

	OMAP USB SUPPORT		OMAP USB SUPPORT
	M: Felipe Balbi <balbi@ti.com>		M: Felipe Balbi <balbi@ti.com>
	M: David Brownell <dbrownell@users.sourceforge.net>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org
	L: linux-omap@vger.kernel.org		L: linux-omap@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
	@@ -5984,7 +5982,6 @@ F: Documentation/serial/specialix.txt
	F: drivers/staging/tty/specialix*		F: drivers/staging/tty/specialix*

	SPI SUBSYSTEM		SPI SUBSYSTEM
	M: David Brownell <dbrownell@users.sourceforge.net>
	M: Grant Likely <grant.likely@secretlab.ca>		M: Grant Likely <grant.likely@secretlab.ca>
	L: spi-devel-general@lists.sourceforge.net		L: spi-devel-general@lists.sourceforge.net
	Q: http://patchwork.kernel.org/project/spi-devel-general/list/		Q: http://patchwork.kernel.org/project/spi-devel-general/list/
	@@ -6432,9 +6429,8 @@ S: Maintained
	F: drivers/usb/misc/rio500*		F: drivers/usb/misc/rio500*

	USB EHCI DRIVER		USB EHCI DRIVER
	M: David Brownell <dbrownell@users.sourceforge.net>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org
	S: Odd Fixes		S: Orphan
	F: Documentation/usb/ehci.txt		F: Documentation/usb/ehci.txt
	F: drivers/usb/host/ehci*		F: drivers/usb/host/ehci*

	@@ -6448,10 +6444,9 @@ S: Maintained
	F: drivers/media/video/et61x251/		F: drivers/media/video/et61x251/

	USB GADGET/PERIPHERAL SUBSYSTEM		USB GADGET/PERIPHERAL SUBSYSTEM
	M: David Brownell <dbrownell@users.sourceforge.net>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org
	W: http://www.linux-usb.org/gadget		W: http://www.linux-usb.org/gadget
	S: Maintained		S: Orphan
	F: drivers/usb/gadget/		F: drivers/usb/gadget/
	F: include/linux/usb/gadget*		F: include/linux/usb/gadget*

	@@ -6492,9 +6487,8 @@ S: Maintained
	F: sound/usb/midi.*		F: sound/usb/midi.*

	USB OHCI DRIVER		USB OHCI DRIVER
	M: David Brownell <dbrownell@users.sourceforge.net>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org
	S: Odd Fixes		S: Orphan
	F: Documentation/usb/ohci.txt		F: Documentation/usb/ohci.txt
	F: drivers/usb/host/ohci*		F: drivers/usb/host/ohci*

arch/arm/mach-omap1/dma.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -284,14 +284,15 @@ static int __init omap1_system_dma_init(void)
	dma_base = ioremap(res[0].start, resource_size(&res[0]));		dma_base = ioremap(res[0].start, resource_size(&res[0]));
	if (!dma_base) {		if (!dma_base) {
	pr_err("%s: Unable to ioremap\n", __func__);		pr_err("%s: Unable to ioremap\n", __func__);
	return -ENODEV;		ret = -ENODEV;
			goto exit_device_put;
	}		}

	ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));		ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
	if (ret) {		if (ret) {
	dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n",		dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n",
	__func__, pdev->name, pdev->id);		__func__, pdev->name, pdev->id);
	goto exit_device_del;		goto exit_device_put;
	}		}

	p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);		p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);
	@@ -299,7 +300,7 @@ static int __init omap1_system_dma_init(void)
	dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n",		dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n",
	__func__, pdev->name);		__func__, pdev->name);
	ret = -ENOMEM;		ret = -ENOMEM;
	goto exit_device_put;		goto exit_device_del;
	}		}

	d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL);		d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL);
	@@ -380,10 +381,10 @@ exit_release_d:
	kfree(d);		kfree(d);
	exit_release_p:		exit_release_p:
	kfree(p);		kfree(p);
	exit_device_put:
	platform_device_put(pdev);
	exit_device_del:		exit_device_del:
	platform_device_del(pdev);		platform_device_del(pdev);
			exit_device_put:
			platform_device_put(pdev);

	return ret;		return ret;
	}		}

arch/arm/mach-omap2/board-2430sdp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,13 +26,13 @@
	#include <linux/err.h>		#include <linux/err.h>
	#include <linux/clk.h>		#include <linux/clk.h>
	#include <linux/io.h>		#include <linux/io.h>
			#include <linux/gpio.h>

	#include <mach/hardware.h>		#include <mach/hardware.h>
	#include <asm/mach-types.h>		#include <asm/mach-types.h>
	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/map.h>		#include <asm/mach/map.h>

	#include <mach/gpio.h>
	#include <plat/board.h>		#include <plat/board.h>
	#include <plat/common.h>		#include <plat/common.h>
	#include <plat/gpmc.h>		#include <plat/gpmc.h>

arch/arm/mach-omap2/board-3430sdp.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -622,19 +622,19 @@ static struct omap_device_pad serial3_pads[] __initdata = {
	OMAP_MUX_MODE0),		OMAP_MUX_MODE0),
	};		};

	static struct omap_board_data serial1_data = {		static struct omap_board_data serial1_data __initdata = {
	.id = 0,		.id = 0,
	.pads = serial1_pads,		.pads = serial1_pads,
	.pads_cnt = ARRAY_SIZE(serial1_pads),		.pads_cnt = ARRAY_SIZE(serial1_pads),
	};		};

	static struct omap_board_data serial2_data = {		static struct omap_board_data serial2_data __initdata = {
	.id = 1,		.id = 1,
	.pads = serial2_pads,		.pads = serial2_pads,
	.pads_cnt = ARRAY_SIZE(serial2_pads),		.pads_cnt = ARRAY_SIZE(serial2_pads),
	};		};

	static struct omap_board_data serial3_data = {		static struct omap_board_data serial3_data __initdata = {
	.id = 2,		.id = 2,
	.pads = serial3_pads,		.pads = serial3_pads,
	.pads_cnt = ARRAY_SIZE(serial3_pads),		.pads_cnt = ARRAY_SIZE(serial3_pads),