Merge branch 'sh/stable-updates' (028c5d5d) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/cpu-freq/governors.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -145,8 +145,8 @@ show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
		up_threshold: defines what the average CPU usage between the samplings
		of 'sampling_rate' needs to be for the kernel to make a decision on
		whether it should increase the frequency. For example when it is set
		to its default value of '80' it means that between the checking
		intervals the CPU needs to be on average more than 80% in use to then
		to its default value of '95' it means that between the checking
		intervals the CPU needs to be on average more than 95% in use to then
		decide that the CPU frequency needs to be increased.

		ignore_nice_load: this parameter takes a value of '0' or '1'. When

MAINTAINERS

+5 −2

Original line number	Diff line number	Diff line
		@@ -3411,8 +3411,10 @@ S: Maintained
		F: drivers/scsi/sym53c8xx_2/

		LTP (Linux Test Project)
		M: Subrata Modak <subrata@linux.vnet.ibm.com>
		M: Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
		M: Garrett Cooper <yanegomi@gmail.com>
		M: Mike Frysinger <vapier@gentoo.org>
		M: Subrata Modak <subrata@linux.vnet.ibm.com>
		L: ltp-list@lists.sourceforge.net (subscribers-only)
		W: http://ltp.sourceforge.net/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
		@@ -3836,6 +3838,7 @@ NETWORKING DRIVERS
		L: netdev@vger.kernel.org
		W: http://www.linuxfoundation.org/en/Net
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
		S: Odd Fixes
		F: drivers/net/
		F: include/linux/if_*

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 33
		EXTRAVERSION = -rc7
		EXTRAVERSION = -rc8
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION

arch/arm/mach-omap2/mmc-twl4030.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -408,6 +408,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
		{
		struct twl4030_hsmmc_info *c;
		int nr_hsmmc = ARRAY_SIZE(hsmmc_data);
		int i;

		if (cpu_is_omap2430()) {
		control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;
		@@ -434,7 +435,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
		mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);
		if (!mmc) {
		pr_err("Cannot allocate memory for mmc device!\n");
		return;
		goto done;
		}

		if (c->name)
		@@ -532,6 +533,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
		continue;
		c->dev = mmc->dev;
		}

		done:
		for (i = 0; i < nr_hsmmc; i++)
		kfree(hsmmc_data[i]);
		}

		#endif

arch/avr32/mach-at32ap/at32ap700x.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -1325,7 +1325,7 @@ struct platform_device *__init
		at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
		{
		struct platform_device *pdev;
		struct mci_dma_slave *slave;
		struct mci_dma_data *slave;
		u32 pioa_mask;
		u32 piob_mask;

		@@ -1344,7 +1344,9 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
		ARRAY_SIZE(atmel_mci0_resource)))
		goto fail;

		slave = kzalloc(sizeof(struct mci_dma_slave), GFP_KERNEL);
		slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
		if (!slave)
		goto fail;

		slave->sdata.dma_dev = &dw_dmac0_device.dev;
		slave->sdata.reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
		@@ -1357,7 +1359,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)

		if (platform_device_add_data(pdev, data,
		sizeof(struct mci_platform_data)))
		goto fail;
		goto fail_free;

		/* CLK line is common to both slots */
		pioa_mask = 1 << 10;
		@@ -1381,7 +1383,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
		/* Slot is unused */
		break;
		default:
		goto fail;
		goto fail_free;
		}

		select_peripheral(PIOA, pioa_mask, PERIPH_A, 0);
		@@ -1408,7 +1410,7 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
		break;
		default:
		if (!data->slot[0].bus_width)
		goto fail;
		goto fail_free;

		data->slot[1].bus_width = 0;
		break;
		@@ -1419,9 +1421,10 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
		platform_device_add(pdev);
		return pdev;

		fail_free:
		kfree(slave);
		fail:
		data->dma_slave = NULL;
		kfree(slave);
		platform_device_put(pdev);
		return NULL;
		}