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

Commit ced62c33 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup 

From:  Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX cleanups for 3.5

* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6

: (5 commits)
  ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN
  ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message
  ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads
  arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig
  arm: imx: make various struct sys_timer static

Includes an update to 3.4-rc4

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3ff80abc 6838e601

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>

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2304,9 +2304,9 @@ S: Supported 
F:	drivers/acpi/dock.c



DOCUMENTATION

M:	Randy Dunlap <rdunlap@xenotime.net>

M:	Rob Landley <rob@landley.net>

L:	linux-doc@vger.kernel.org

T:	quilt http://xenotime.net/kernel-doc-patches/current/

T:	TBD

S:	Maintained

F:	Documentation/

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ CONFIG_WATCHDOG=y 
CONFIG_IMX2_WDT=y

CONFIG_MFD_MC13XXX=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_FB=y