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

Commit afcf7924 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' into next/cleanup 



Merging in fixes since there's a conflict in the omap4 clock tables caused by
it.

* fixes: (245 commits)
  ARM: highbank: fix cache flush ordering for cpu hotplug
  ARM: OMAP4: hwmod data: make 'ocp2scp_usb_phy_phy_48m" as the main clock
  arm: mvebu: Fix the irq map function in SMP mode
  Fix GE0/GE1 init on ix2-200 as GE0 has no PHY
  ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller
  ARM: S3C24XX: Correct NR_IRQS definition for s3c2440
  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
  + Linux 3.9-rc6

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-omap2/cclock44xx_data.c
parents dc9c2203 d21be237

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

+8 −2
Original line number Diff line number Diff line
@@ -4941,6 +4941,12 @@ W: logfs.org 
S:	Maintained

F:	fs/logfs/



LPC32XX MACHINE SUPPORT

M:	Roland Stigge <stigge@antcom.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-lpc32xx/



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
@@ -5065,9 +5071,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 +5574,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