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

Commit 753e23ea authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'v3.9-rc7' into asoc-dma

Linux 3.9-rc7
parents c999836d 41ef2d56
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
  <chapter id="uart16x50">
     <title>16x50 UART Driver</title>
!Edrivers/tty/serial/serial_core.c
!Edrivers/tty/serial/8250/8250.c
!Edrivers/tty/serial/8250/8250_core.c
  </chapter>

  <chapter id="fbdev">
+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ amemthresh - INTEGER
        enabled and the variable is automatically set to 2, otherwise
        the strategy is disabled and the variable is  set  to 1.

backup_only - BOOLEAN
	0 - disabled (default)
	not 0 - enabled

	If set, disable the director function while the server is
	in backup mode to avoid packet loops for DR/TUN methods.

conntrack - BOOLEAN
	0 - disabled (default)
	not 0 - enabled
+1 −1
Original line number Diff line number Diff line
Copyright (c) 2003-2012 QLogic Corporation
Copyright (c) 2003-2013 QLogic Corporation
QLogic Linux FC-FCoE Driver

This program includes a device driver for Linux 3.x.
+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
+24 −18
Original line number Diff line number Diff line
@@ -3242,6 +3242,12 @@ F: Documentation/firmware_class/
F:	drivers/base/firmware*.c
F:	include/linux/firmware.h

FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)
M:	Joshua Morris <josh.h.morris@us.ibm.com>
M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>
S:	Maintained
F:	drivers/block/rsxx/

FLOPPY DRIVER
M:	Jiri Kosina <jkosina@suse.cz>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -4935,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>
@@ -5059,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
@@ -5563,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
@@ -5683,7 +5695,7 @@ S: Maintained
F:	arch/arm/*omap*/*clock*

OMAP POWER MANAGEMENT SUPPORT
M:	Kevin Hilman <khilman@ti.com>
M:	Kevin Hilman <khilman@deeprootsystems.com>
L:	linux-omap@vger.kernel.org
S:	Maintained
F:	arch/arm/*omap*/*pm*
@@ -5777,7 +5789,7 @@ F: arch/arm/*omap*/usb*

OMAP GPIO DRIVER
M:	Santosh Shilimkar <santosh.shilimkar@ti.com>
M:	Kevin Hilman <khilman@ti.com>
M:	Kevin Hilman <khilman@deeprootsystems.com>
L:	linux-omap@vger.kernel.org
S:	Maintained
F:	drivers/gpio/gpio-omap.c
@@ -6209,7 +6221,7 @@ F: include/linux/power_supply.h
F:	drivers/power/

PNP SUPPORT
M:	Adam Belay <abelay@mit.edu>
M:	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
M:	Bjorn Helgaas <bhelgaas@google.com>
S:	Maintained
F:	drivers/pnp/
@@ -6551,12 +6563,6 @@ S: Maintained
F:	Documentation/blockdev/ramdisk.txt
F:	drivers/block/brd.c

RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)
M:	Joshua Morris <josh.h.morris@us.ibm.com>
M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>
S:	Maintained
F:	drivers/block/rsxx/

RANDOM NUMBER DRIVER
M:	Theodore Ts'o" <tytso@mit.edu>
S:	Maintained
@@ -6625,7 +6631,7 @@ S: Supported
F:	fs/reiserfs/

REGISTER MAP ABSTRACTION
M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
M:	Mark Brown <broonie@kernel.org>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
S:	Supported
F:	drivers/base/regmap/
@@ -6951,7 +6957,6 @@ F: drivers/scsi/st*

SCTP PROTOCOL
M:	Vlad Yasevich <vyasevich@gmail.com>
M:	Sridhar Samudrala <sri@us.ibm.com>
M:	Neil Horman <nhorman@tuxdriver.com>
L:	linux-sctp@vger.kernel.org
W:	http://lksctp.sourceforge.net
@@ -7173,7 +7178,7 @@ F: arch/arm/mach-s3c2410/bast-irq.c

TI DAVINCI MACHINE SUPPORT
M:	Sekhar Nori <nsekhar@ti.com>
M:	Kevin Hilman <khilman@ti.com>
M:	Kevin Hilman <khilman@deeprootsystems.com>
L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
T:	git git://gitorious.org/linux-davinci/linux-davinci.git
Q:	http://patchwork.kernel.org/project/linux-davinci/list/
@@ -7374,7 +7379,7 @@ F: sound/

SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
M:	Liam Girdwood <lgirdwood@gmail.com>
M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
M:	Mark Brown <broonie@kernel.org>
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
W:	http://alsa-project.org/main/index.php/ASoC
@@ -7463,7 +7468,7 @@ F: drivers/clk/spear/

SPI SUBSYSTEM
M:	Grant Likely <grant.likely@secretlab.ca>
M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
M:	Mark Brown <broonie@kernel.org>
L:	spi-devel-general@lists.sourceforge.net
Q:	http://patchwork.kernel.org/project/spi-devel-general/list/
T:	git git://git.secretlab.ca/git/linux-2.6.git
@@ -7706,9 +7711,10 @@ F: include/linux/swiotlb.h

SYNOPSYS ARC ARCHITECTURE
M:	Vineet Gupta <vgupta@synopsys.com>
L:	linux-snps-arc@vger.kernel.org
S:	Supported
F:	arch/arc/
F:	Documentation/devicetree/bindings/arc/
F:	drivers/tty/serial/arc-uart.c

SYSV FILESYSTEM
M:	Christoph Hellwig <hch@infradead.org>
@@ -8707,7 +8713,7 @@ F: drivers/scsi/vmw_pvscsi.h

VOLTAGE AND CURRENT REGULATOR FRAMEWORK
M:	Liam Girdwood <lrg@ti.com>
M:	Mark Brown <broonie@opensource.wolfsonmicro.com>
M:	Mark Brown <broonie@kernel.org>
W:	http://opensource.wolfsonmicro.com/node/15
W:	http://www.slimlogic.co.uk/?p=48
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
Loading