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

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

Merge tag 'omap-for-v3.10/soc-signed' of... 

Merge tag 'omap-for-v3.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

From Tony Lindgren <tony@atomide.com>:

Changes needed for enabling SOC_BUS for the SoC revision
information. Also enable few HW errata workarounds for omap4.

* tag 'omap-for-v3.10/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (236 commits)
  ARM: OMAP4: Enable fix for Cortex-A9 erratas
  ARM: OMAP2+: Export SoC information to userspace
  ARM: OMAP2+: SoC name and revision unification
  ARM: OMAP2+: Move common part of late init into common function

Includes an update to Linux 3.9-rc6

Conflicts:
	arch/arm/mach-omap2/cclock44xx_data.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 56734ee2 7a981995

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −3
Original line number 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)

    power_save	- Automatic power-saving timeout (in second, 0 =

		disable)

    power_save_controller - Support runtime D3 of HD-audio controller

		(-1 = on for supported chip (default), false = off,

		 true = force to on even for unsupported hardware)

    power_save_controller - Reset HD-audio controller in power-saving mode

		(default = on)

    align_buffer_size - Force rounding of buffer/period sizes to multiples

    		      of 128 bytes. This is more efficient in terms of memory

		      access but isn't required by the HDA spec and prevents

MAINTAINERS

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



MARVELL LIBERTAS WIRELESS DRIVER

M:	Dan Williams <dcbw@redhat.com>

L:	libertas-dev@lists.infradead.org

S:	Maintained

S:	Orphan

F:	drivers/net/wireless/libertas/



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



NETXEN (1/10) GbE SUPPORT

M:	Manish Chopra <manish.chopra@qlogic.com>

M:	Sony Chacko <sony.chacko@qlogic.com>

M:	Rajesh Borundia <rajesh.borundia@qlogic.com>

L:	netdev@vger.kernel.org

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/alpha/Makefile

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


LDFLAGS_vmlinux	:= -static -N #-relax

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)



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

arch/alpha/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define fd_disable_irq()        disable_irq(FLOPPY_IRQ)

#define fd_cacheflush(addr,size) /* nothing */

#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)



#ifdef CONFIG_PCI