Commit 87c35c56 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'ux500-u9540-for-arm-soc' of... 

Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/newsoc

From: Linus Walleij <linus.walleij@linaro.org>:
  Core support for the U9540 after finalized review

* 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

: (2 commits)
  ARM: ux500: ioremap differences for DB9540
  ARM: ux500: core U9540 support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d1ef5bd7 ee9581d7

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
@@ -2321,9 +2321,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE