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

Commit e135e450 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers 

* 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6: (3 commits)
  ARM: imx6q: add cko1 clock
  ARM: mxc: make imx_dma_is_general_purpose more generic for sdma
  ARM: imx6: Rename DEBUG_IMX6Q_UART to UART4
parents ee80285e 1aa0cf67

MAINTAINERS

+3 −6
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ S: Orphan 
F:	drivers/platform/x86/wmi.c



AD1889 ALSA SOUND DRIVER

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Thibaut Varene <T-Bone@parisc-linux.org>

W:	http://wiki.parisc-linux.org/AD1889

L:	linux-parisc@vger.kernel.org
@@ -3047,7 +3046,6 @@ F: drivers/hwspinlock/hwspinlock_* 
F:	include/linux/hwspinlock.h



HARMONY SOUND DRIVER

M:	Kyle McMartin <kyle@mcmartin.ca>

L:	linux-parisc@vger.kernel.org

S:	Maintained

F:	sound/parisc/harmony.*
@@ -5000,9 +4998,8 @@ F: Documentation/blockdev/paride.txt 
F:	drivers/block/paride/



PARISC ARCHITECTURE

M:	Kyle McMartin <kyle@mcmartin.ca>

M:	Helge Deller <deller@gmx.de>

M:	"James E.J. Bottomley" <jejb@parisc-linux.org>

M:	Helge Deller <deller@gmx.de>

L:	linux-parisc@vger.kernel.org

W:	http://www.parisc-linux.org/

Q:	http://patchwork.kernel.org/project/linux-parisc/list/
@@ -5861,7 +5858,7 @@ S: Maintained 
F:	drivers/mmc/host/sdhci-spear.c



SECURITY SUBSYSTEM

M:	James Morris <jmorris@namei.org>

M:	James Morris <james.l.morris@oracle.com>

L:	linux-security-module@vger.kernel.org (suggested Cc:)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git

W:	http://security.wiki.kernel.org/
@@ -5874,7 +5871,7 @@ S: Supported 


SELINUX SECURITY MODULE

M:	Stephen Smalley <sds@tycho.nsa.gov>

M:	James Morris <jmorris@namei.org>

M:	James Morris <james.l.morris@oracle.com>

M:	Eric Paris <eparis@parisplace.org>

L:	selinux@tycho.nsa.gov (subscribers-only, general discussion)

W:	http://selinuxproject.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX50 or i.MX53.



	config DEBUG_IMX6Q_UART

		bool "i.MX6Q Debug UART"

	config DEBUG_IMX6Q_UART4

		bool "i.MX6Q Debug UART4"

		depends on SOC_IMX6Q

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX6Q.

		  on i.MX6Q UART4.



	config DEBUG_MSM_UART1

		bool "Kernel low-level debugging messages via MSM UART1"

arch/arm/common/it8152.c

+0 −7
Original line number Diff line number Diff line
@@ -320,13 +320,6 @@ err0: 
	return -EBUSY;

}



/*

 * If we set up a device for bus mastering, we need to check the latency

 * timer as we don't have even crappy BIOSes to set it properly.

 * The implementation is from arch/i386/pci/i386.c

 */

unsigned int pcibios_max_latency = 255;



/* ITE bridge requires setting latency timer to avoid early bus access

   termination by PCI bus master devices

*/

arch/arm/common/pl330.c

+2 −1
Original line number Diff line number Diff line
@@ -1502,12 +1502,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op) 
	struct pl330_thread *thrd = ch_id;

	struct pl330_dmac *pl330;

	unsigned long flags;

	int ret = 0, active = thrd->req_running;

	int ret = 0, active;



	if (!thrd || thrd->free || thrd->dmac->state == DYING)

		return -EINVAL;



	pl330 = thrd->dmac;

	active = thrd->req_running;



	spin_lock_irqsave(&pl330->lock, flags);