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

Commit 8fe5f56c authored Apr 26, 2012 by David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux



Conflicts:
	arch/sparc/kernel/leon_smp.c

Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.

Resolve a small include line conflict in leon_smp.c

Signed-off-by: David S. Miller <davem@davemloft.net>

parents df2e7f52 82b76906

Documentation/ABI/testing/sysfs-block-rssd

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		What: /sys/block/rssd*/registers
		Date: March 2012
		KernelVersion: 3.3
		Contact: Asai Thambi S P <asamymuthupa@micron.com>
		Description: This is a read-only file. Dumps below driver information and
		hardware registers.
		- S ACTive
		- Command Issue
		- Allocated
		- Completed
		- PORT IRQ STAT
		- HOST IRQ STAT

		What: /sys/block/rssd*/status
		Date: April 2012
		KernelVersion: 3.4
		Contact: Asai Thambi S P <asamymuthupa@micron.com>
		Description: This is a read-only file. Indicates the status of the device.

Documentation/ABI/testing/sysfs-bus-hsi

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/hsi
		Date: April 2012
		KernelVersion: 3.4
		Contact: Carlos Chinea <carlos.chinea@nokia.com>
		Description:
		High Speed Synchronous Serial Interface (HSI) is a
		serial interface mainly used for connecting application
		engines (APE) with cellular modem engines (CMT) in cellular
		handsets.
		The bus will be populated with devices (hsi_clients) representing
		the protocols available in the system. Bus drivers implement
		those protocols.

		What: /sys/bus/hsi/devices/.../modalias
		Date: April 2012
		KernelVersion: 3.4
		Contact: Carlos Chinea <carlos.chinea@nokia.com>
		Description: Stores the same MODALIAS value emitted by uevent
		Format: hsi:<hsi_client device name>

Documentation/ABI/testing/sysfs-cfq-target-latency

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		What: /sys/block/<device>/iosched/target_latency
		Date: March 2012
		contact: Tao Ma <boyu.mt@taobao.com>
		Description:
		The /sys/block/<device>/iosched/target_latency only exists
		when the user sets cfq to /sys/block/<device>/scheduler.
		It contains an estimated latency time for the cfq. cfq will
		use it to calculate the time slice used for every task.

Documentation/DocBook/media/v4l/pixfmt-nv12m.xml

+1 −1

Original line number	Diff line number	Diff line
		<refentry id="V4L2-PIX-FMT-NV12M">
		<refmeta>
		<refentrytitle>V4L2_PIX_FMT_NV12M ('NV12M')</refentrytitle>
		<refentrytitle>V4L2_PIX_FMT_NV12M ('NM12')</refentrytitle>
		&manvol;
		</refmeta>
		<refnamediv>

Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml

+1 −1

Original line number	Diff line number	Diff line
		<refentry id="V4L2-PIX-FMT-YUV420M">
		<refmeta>
		<refentrytitle>V4L2_PIX_FMT_YUV420M ('YU12M')</refentrytitle>
		<refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12')</refentrytitle>
		&manvol;
		</refmeta>
		<refnamediv>