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

Commit 69ecdbac authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge remote-tracking branch 'linus/master' into staging/for_v3.5 

* linus/master: (805 commits)
  tty: Fix LED error return
  openvswitch: checking wrong variable in queue_userspace_packet()
  bonding: Fix LACPDU rx_dropped commit.
  Linux 3.4-rc7
  ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1
  ARM: EXYNOS: use s5p-timer for UniversalC210 board
  ARM / mach-shmobile: Invalidate caches when booting secondary cores
  ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix
  ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix
  ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper
  ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper
  MAINTAINERS: Add myself as the cpufreq maintainer
  dm mpath: check if scsi_dh module already loaded before trying to load
  dm thin: correct module description
  dm thin: fix unprotected use of prepared_discards list
  dm thin: reinstate missing mempool_free in cell_release_singleton
  gpio/exynos: Fix compiler warnings when non-exynos machines are selected
  gpio: pch9: Use proper flow type handlers
  powerpc/irq: Fix another case of lazy IRQ state getting out of sync
  ks8851: Update link status during link change interrupt
  ...

Conflicts:
	drivers/media/common/tuners/xc5000.c
	drivers/media/common/tuners/xc5000.h
	drivers/usb/gadget/uvc_queue.c
parents b7dc4cd1 b6255ee3

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/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>

Documentation/devicetree/bindings/ata/calxeda-sata.txt→Documentation/devicetree/bindings/ata/ahci-platform.txt

+2 −3
Original line number Diff line number Diff line 
* Calxeda SATA Controller

* AHCI SATA Controller



SATA nodes are defined to describe on-chip Serial ATA controllers.

Each SATA controller should have its own node.



Required properties:

- compatible        : compatible list, contains "calxeda,hb-ahci"

- compatible        : compatible list, contains "calxeda,hb-ahci" or "snps,spear-ahci"

- interrupts        : <interrupt mapping for SATA IRQ>

- reg               : <registers mapping>
@@ -14,4 +14,3 @@ Example: 
                reg = <0xffe08000 0x1000>;

                interrupts = <115>;

        };

Documentation/devicetree/bindings/sound/sgtl5000.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
Required properties:

- compatible : "fsl,sgtl5000".



- reg : the I2C address of the device



Example:



codec: sgtl5000@0a {