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

This project is archived. Its data is read-only.

Commit 9b6d7777 authored Apr 18, 2011 by Paul Mundt

Merge branch 'for-paul-39-rc' of git://gitorious.org/linux-omap-dss2/linux...

Merge branch 'for-paul-39-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus

parents b07f3bbe 0fd08060

MAINTAINERS

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6916,6 +6916,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.
	S: Maintained		S: Maintained
	F: drivers/platform/x86		F: drivers/platform/x86

			XEN NETWORK BACKEND DRIVER
			M: Ian Campbell <ian.campbell@citrix.com>
			L: xen-devel@lists.xensource.com (moderated for non-subscribers)
			L: netdev@vger.kernel.org
			S: Supported
			F: drivers/net/xen-netback/*

	XEN PCI SUBSYSTEM		XEN PCI SUBSYSTEM
	M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>		M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
	L: xen-devel@lists.xensource.com (moderated for non-subscribers)		L: xen-devel@lists.xensource.com (moderated for non-subscribers)

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 39		SUBLEVEL = 39
	EXTRAVERSION = -rc2		EXTRAVERSION = -rc3
	NAME = Flesh-Eating Bats with Fangs		NAME = Flesh-Eating Bats with Fangs

	# DOCUMENTATION		# DOCUMENTATION

drivers/dma/fsldma.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1448,7 +1448,7 @@ static const struct of_device_id fsldma_of_ids[] = {
	{}		{}
	};		};

	static struct of_platform_driver fsldma_of_driver = {		static struct platform_driver fsldma_of_driver = {
	.driver = {		.driver = {
	.name = "fsl-elo-dma",		.name = "fsl-elo-dma",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,

drivers/gpio/ml_ioh_gpio.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,7 @@ static int ioh_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
	reg_val \|= (1 << nr);		reg_val \|= (1 << nr);
	else		else
	reg_val &= ~(1 << nr);		reg_val &= ~(1 << nr);
			iowrite32(reg_val, &chip->reg->regs[chip->ch].po);

	mutex_unlock(&chip->lock);		mutex_unlock(&chip->lock);

drivers/gpio/pca953x.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -558,7 +558,7 @@ static int __devinit pca953x_probe(struct i2c_client *client,

	ret = gpiochip_add(&chip->gpio_chip);		ret = gpiochip_add(&chip->gpio_chip);
	if (ret)		if (ret)
	goto out_failed;		goto out_failed_irq;

	if (pdata->setup) {		if (pdata->setup) {
	ret = pdata->setup(client, chip->gpio_chip.base,		ret = pdata->setup(client, chip->gpio_chip.base,
	@@ -570,8 +570,9 @@ static int __devinit pca953x_probe(struct i2c_client *client,
	i2c_set_clientdata(client, chip);		i2c_set_clientdata(client, chip);
	return 0;		return 0;

	out_failed:		out_failed_irq:
	pca953x_irq_teardown(chip);		pca953x_irq_teardown(chip);
			out_failed:
	kfree(chip->dyn_pdata);		kfree(chip->dyn_pdata);
	kfree(chip);		kfree(chip);
	return ret;		return ret;