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

Commit 743c5bb8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/dma' of... 

Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap

Conflicts:
	sound/soc/omap/Kconfig
parents 8fe120b5 b7ae6f31

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ modules.builtin 
*.bz2

*.lzma

*.xz

*.lz4

*.lzo

*.patch

*.gcno

Documentation/ABI/testing/sysfs-driver-xen-blkback

0 → 100644
+17 −0
Original line number Diff line number Diff line 
What:           /sys/module/xen_blkback/parameters/max_buffer_pages

Date:           March 2013

KernelVersion:  3.11

Contact:        Roger Pau Monné <roger.pau@citrix.com>

Description:

                Maximum number of free pages to keep in each block

                backend buffer.



What:           /sys/module/xen_blkback/parameters/max_persistent_grants

Date:           March 2013

KernelVersion:  3.11

Contact:        Roger Pau Monné <roger.pau@citrix.com>

Description:

                Maximum number of grants to map persistently in

                blkback. If the frontend tries to use more than

                max_persistent_grants, the LRU kicks in and starts

                removing 5% of max_persistent_grants every 100ms.

Documentation/ABI/testing/sysfs-driver-xen-blkfront

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:           /sys/module/xen_blkfront/parameters/max

Date:           June 2013

KernelVersion:  3.11

Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Description:

                Maximum number of segments that the frontend will negotiate

                with the backend for indirect descriptors. The default value

                is 32 - higher value means more potential throughput but more

                memory usage. The backend picks the minimum of the frontend

                and its default backend value.

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h 


     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

!Ekernel/printk.c

!Ekernel/printk/printk.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/rcupdate.c

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">