Commit 384b8345 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/wm8962' of... 

Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-wm8962

Conflicts:
	sound/soc/codecs/wm8962.c
parents 9c24b167 2e7ee15c

Documentation/dmatest.txt

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ command: 
After a while you will start to get messages about current status or error like

in the original code.



Note that running a new test will stop any in progress test.

Note that running a new test will not stop any in progress test.



The following command should return actual state of the test.

	% cat /sys/kernel/debug/dmatest/run
@@ -52,8 +52,8 @@ To wait for test done the user may perform a busy loop that checks the state. 


The module parameters that is supplied to the kernel command line will be used

for the first performed test. After user gets a control, the test could be

interrupted or re-run with same or different parameters. For the details see

the above section "Part 2 - When dmatest is built as a module..."

re-run with the same or different parameters. For the details see the above

section "Part 2 - When dmatest is built as a module..."



In both cases the module parameters are used as initial values for the test case.

You always could check them at run-time by running

Documentation/filesystems/xfs.txt

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ When mounting an XFS filesystem, the following options are accepted. 
	removing extended attributes) the on-disk superblock feature

	bit field will be updated to reflect this format being in use.



	CRC enabled filesystems always use the attr2 format, and so

	will reject the noattr2 mount option if it is set.



  barrier

	Enables the use of block layer write barriers for writes into

	the journal and unwritten extent conversion.  This allows for

MAINTAINERS

+11 −1
Original line number Diff line number Diff line
@@ -2890,8 +2890,8 @@ F: drivers/media/dvb-frontends/ec100* 


ECRYPT FILE SYSTEM

M:	Tyler Hicks <tyhicks@canonical.com>

M:	Dustin Kirkland <dustin.kirkland@gazzang.com>

L:	ecryptfs@vger.kernel.org

W:	http://ecryptfs.org

W:	https://launchpad.net/ecryptfs

S:	Supported

F:	Documentation/filesystems/ecryptfs.txt
@@ -4448,6 +4448,16 @@ S: Maintained 
F:	drivers/scsi/*iscsi*

F:	include/scsi/*iscsi*



ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR

M:	Or Gerlitz <ogerlitz@mellanox.com>

M:	Roi Dayan <roid@mellanox.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

W:	http://www.openfabrics.org

W:	www.open-iscsi.org

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

F:	drivers/infiniband/ulp/iser



ISDN SUBSYSTEM

M:	Karsten Keil <isdn@linux-pingi.de>

L:	isdn4linux@listserv.isdn4linux.de (subscribers-only)

Makefile

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

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/arm/boot/dts/bcm2835.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ uart@20201000 { 
			reg = <0x7e201000 0x1000>;

			interrupts = <2 25>;

			clock-frequency = <3000000>;

			arm,primecell-periphid = <0x00241011>;

		};



		gpio: gpio {