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

Commit 73e21ce2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core 



Conflicts:
	arch/x86/kernel/cpu/perf_event_intel.c

Merge in the latest fixes before applying new patches, resolve the conflict.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b5210b2a f1923820

Documentation/DocBook/device-drivers.tmpl

+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">

Documentation/scsi/LICENSE.qla2xxx

+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.

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

+12 −7
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
@@ -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
@@ -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
@@ -8708,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

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc7

NAME = Unicycling Gorilla



# *DOCUMENTATION*