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

Commit f2400194 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Fix merge between commit 3adadc08 ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c8 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a108d5f3 4d634ca3

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+7 −7
Original line number Original line Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/device_capabilities

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:
@@ -12,8 +12,8 @@ Description: 
		The files are read only.

		The files are read only.









What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:
@@ -27,7 +27,7 @@ Description: 
		The files are read only.

		The files are read only.









What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

What:		/sys/bus/usb/drivers/usbtmc/*/TermChar

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:
@@ -40,7 +40,7 @@ Description: 
		sent to the device or not.

		sent to the device or not.









What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

What:		/sys/bus/usb/drivers/usbtmc/*/TermCharEnabled

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:
@@ -51,7 +51,7 @@ Description: 
		published by the USB-IF.

		published by the USB-IF.









What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

What:		/sys/bus/usb/drivers/usbtmc/*/auto_abort

Date:		August 2008

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Description:

Documentation/ABI/testing/sysfs-block-rssd

0 → 100644
+18 −0
Original line number Original line 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-cfq-target-latency

0 → 100644
+8 −0
Original line number Original line 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 Original line Diff line number Diff line 
    <refentry id="V4L2-PIX-FMT-NV12M">

    <refentry id="V4L2-PIX-FMT-NV12M">

      <refmeta>

      <refmeta>

	<refentrytitle>V4L2_PIX_FMT_NV12M ('NV12M')</refentrytitle>

	<refentrytitle>V4L2_PIX_FMT_NV12M ('NM12')</refentrytitle>

	&manvol;

	&manvol;

      </refmeta>

      </refmeta>

      <refnamediv>

      <refnamediv>

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

+1 −1
Original line number Original line Diff line number Diff line 
    <refentry id="V4L2-PIX-FMT-YUV420M">

    <refentry id="V4L2-PIX-FMT-YUV420M">

      <refmeta>

      <refmeta>

	<refentrytitle>V4L2_PIX_FMT_YUV420M ('YU12M')</refentrytitle>

	<refentrytitle>V4L2_PIX_FMT_YUV420M ('YM12')</refentrytitle>

	&manvol;

	&manvol;

      </refmeta>

      </refmeta>

      <refnamediv>

      <refnamediv>