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

Commit 0a01216c authored Apr 09, 2013 by Arnd Bergmann

Merge tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo <shawn.guo@linaro.org>:

The imx fixes for 3.9, take 5:

* A couple imx35 clock fixes for regressions caused by common clock
  framework conversion.  The admux and iomux get disabled by common
  clock framework late initcall, and hence causes problems.
* Add missing twd clock lookup in device tree.  This becomes required
  since commit bd603455 (ARM: use device tree to get smp_twd clock)
  forces all DT boot to find lookup from device tree.
* Fix imx6q ldb_di clock parents mismatch per reference manual.

* tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6

: (217 commits)
  ARM i.MX6: Fix ldb_di clock selection
  ARM: imx: provide twd clock lookup from device tree
  ARM: imx35 Bugfix admux clock
  ARM: clk-imx35: Bugfix iomux clock

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 81211c4c e8094b2c

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -890,9 +890,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)		enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)
	power_save - Automatic power-saving timeout (in second, 0 =		power_save - Automatic power-saving timeout (in second, 0 =
	disable)		disable)
	power_save_controller - Support runtime D3 of HD-audio controller		power_save_controller - Reset HD-audio controller in power-saving mode
	(-1 = on for supported chip (default), false = off,		(default = on)
	true = force to on even for unsupported hardware)
	align_buffer_size - Force rounding of buffer/period sizes to multiples		align_buffer_size - Force rounding of buffer/period sizes to multiples
	of 128 bytes. This is more efficient in terms of memory		of 128 bytes. This is more efficient in terms of memory
	access but isn't required by the HDA spec and prevents		access but isn't required by the HDA spec and prevents

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5071,9 +5071,8 @@ S: Maintained
	F: drivers/net/ethernet/marvell/sk*		F: drivers/net/ethernet/marvell/sk*

	MARVELL LIBERTAS WIRELESS DRIVER		MARVELL LIBERTAS WIRELESS DRIVER
	M: Dan Williams <dcbw@redhat.com>
	L: libertas-dev@lists.infradead.org		L: libertas-dev@lists.infradead.org
	S: Maintained		S: Orphan
	F: drivers/net/wireless/libertas/		F: drivers/net/wireless/libertas/

	MARVELL MV643XX ETHERNET DRIVER		MARVELL MV643XX ETHERNET DRIVER
	@@ -5575,6 +5574,7 @@ F: include/uapi/linux/if_*
	F: include/uapi/linux/netdevice.h		F: include/uapi/linux/netdevice.h

	NETXEN (1/10) GbE SUPPORT		NETXEN (1/10) GbE SUPPORT
			M: Manish Chopra <manish.chopra@qlogic.com>
	M: Sony Chacko <sony.chacko@qlogic.com>		M: Sony Chacko <sony.chacko@qlogic.com>
	M: Rajesh Borundia <rajesh.borundia@qlogic.com>		M: Rajesh Borundia <rajesh.borundia@qlogic.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 9		PATCHLEVEL = 9
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc5		EXTRAVERSION = -rc6
	NAME = Unicycling Gorilla		NAME = Unicycling Gorilla

	# DOCUMENTATION		# DOCUMENTATION

arch/alpha/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@ NM := $(NM) -B

	LDFLAGS_vmlinux := -static -N #-relax		LDFLAGS_vmlinux := -static -N #-relax
	CHECKFLAGS += -D__alpha__ -m64		CHECKFLAGS += -D__alpha__ -m64
	cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data		cflags-y := -pipe -mno-fp-regs -ffixed-8
	cflags-y += $(call cc-option, -fno-jump-tables)		cflags-y += $(call cc-option, -fno-jump-tables)

	cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4		cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4

arch/alpha/include/asm/floppy.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@
	#define fd_disable_irq() disable_irq(FLOPPY_IRQ)		#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
	#define fd_cacheflush(addr,size) /* nothing */		#define fd_cacheflush(addr,size) /* nothing */
	#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\		#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\
	IRQF_DISABLED, "floppy", NULL)		0, "floppy", NULL)
	#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL)		#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL)

	#ifdef CONFIG_PCI		#ifdef CONFIG_PCI