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

Commit 8dd2b66d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.10-2' of... 

Merge tag 'asoc-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.10

The main additional change here is Lars-Peter's DMA work plus the
platform conversions which have been tested - getting this in mainline
will make life easier for development after the merge window.  These
factor a large chunk of code out of the drivers for the platforms using
dmaengine, greatly simplifying development.
parents 126825e7 24568ea4

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.

MAINTAINERS

+6 −1
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>
@@ -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

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/arc/include/asm/irqflags.h

+8 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static inline long arch_local_irq_save(void) 
	"	flag.nz %0		\n"

	: "=r"(temp), "=r"(flags)

	: "n"((STATUS_E1_MASK | STATUS_E2_MASK))

	: "cc");

	: "memory", "cc");



	return flags;

}
@@ -53,7 +53,8 @@ static inline void arch_local_irq_restore(unsigned long flags) 
	__asm__ __volatile__(

	"	flag %0			\n"

	:

	: "r"(flags));

	: "r"(flags)

	: "memory");

}



/*
@@ -73,7 +74,8 @@ static inline void arch_local_irq_disable(void) 
	"	and %0, %0, %1		\n"

	"	flag %0			\n"

	: "=&r"(temp)

	: "n"(~(STATUS_E1_MASK | STATUS_E2_MASK)));

	: "n"(~(STATUS_E1_MASK | STATUS_E2_MASK))

	: "memory");

}



/*
@@ -85,7 +87,9 @@ static inline long arch_local_save_flags(void) 


	__asm__ __volatile__(

	"	lr  %0, [status32]	\n"

	: "=&r"(temp));

	: "=&r"(temp)

	:

	: "memory");



	return temp;

}