Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ...

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-01-07 11:51:28 +00:00

..

davinci

ARM: davinci: vpif: move code to driver core header from platform

2011-12-03 00:33:50 +05:30

adp1653.h

[media] adp1653: Add driver for LED flash controller

2011-07-27 17:55:39 -03:00

adv7343.h

V4L/DVB (11743): Analog Devices ADV7343 video encoder driver

2009-06-16 18:20:59 -03:00

ak881x.h

V4L/DVB: V4L: v4l2-subdev driver for AK8813 and AK8814 TV-encoders from AKM

2010-05-19 12:58:02 -03:00

atmel-isi.h

[media] V4L: at91: add Atmel Image Sensor Interface (ISI) support

2011-07-27 17:53:23 -03:00

bt819.h

[media] bt819: the ioctls in the header are internal to the kernel

2010-12-29 08:17:19 -02:00

cs53l32a.h

…

cs5345.h

…

cx2341x.h

[media] v4l2-ctrls: use const char * const * for the menu arrays

2010-12-30 08:02:14 -02:00

cx25840.h

V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config

2010-08-08 23:43:05 -03:00

i2c-addr.h

…

ir-kbd-i2c.h

[media] rc: Rename remote controller type to rc_type instead of ir_type

2010-12-29 08:16:50 -02:00

lirc_dev.h

[media] lirc_dev: store cdev in irctl, up maxdevs

2011-06-11 09:03:20 -03:00

lirc.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

m5mols.h

[media] m5mols: Remove superfluous irq field from the platform data struct

2011-09-24 00:23:03 -03:00

m52790.h

…

media-device.h

[media] media: Links setup

2011-03-22 04:53:16 -03:00

media-devnode.h

[media] media: Media device node support

2011-03-22 04:52:22 -03:00

media-entity.h

[media] media: Pipelines and media streams

2011-03-22 04:53:17 -03:00

mmp-camera.h

[media] marvell-cam: Basic working MMP camera driver

2011-07-27 17:53:01 -03:00

msp3400.h

V4L/DVB (11380): v4l2-subdev: change s_routing prototype

2009-04-06 21:44:27 -03:00

mt9p031.h

[media] mt9p031: Aptina (Micron) MT9P031 5MP sensor driver

2011-09-11 09:49:28 -03:00

mt9t001.h

[media] mt9t001: Aptina (Micron) MT9T001 3MP sensor driver

2011-09-21 15:31:08 -03:00

mt9t112.h

V4L/DVB (13670): soc-camera: Add mt9t112 camera driver

2009-12-16 09:27:41 -02:00

mt9v011.h

[media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg()

2011-01-19 11:45:30 -02:00

mt9v032.h

[media] v4l: Add mt9v032 sensor driver

2011-05-20 09:29:49 -03:00

noon010pc30.h

[media] Add v4l2 subdev driver for NOON010PC30L image sensor

2011-03-21 20:31:40 -03:00

omap1_camera.h

[media] SoC Camera: add driver for OMAP1 camera interface

2010-10-21 07:55:37 -02:00

omap3isp.h

[media] omap3isp: Move platform data definitions from isp.h to media/omap3isp.h

2011-09-11 09:49:27 -03:00

ov772x.h

[media] V4L: ov772x: remove superfluous soc-camera client operations

2011-11-03 18:28:05 -02:00

ov7670.h

[media] marvell-cam: Move cafe-ccic into its own directory

2011-07-27 17:53:00 -03:00

pwc-ioctl.h

Remove unneeded version.h includes from include/

2011-09-15 14:57:06 +02:00

radio-si4713.h

V4L/DVB (12551): FM TX: si4713: Add files to add radio interface for si4713

2009-09-12 12:19:19 -03:00

rc-core.h

[media] rc-core.h: Surround macro with do {} while (0)

2011-09-03 20:56:22 -03:00

rc-map.h

[media] ati_remote: add support for SnapStream Firefly remote

2011-09-22 10:54:40 -03:00

rj54n1cb0c.h

V4L/DVB (13661): rj54n1cb0c: Add cropping, auto white balance, restrict sizes, add platform data

2009-12-16 09:27:30 -02:00

s5k6aa.h

[media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor

2011-11-03 18:29:11 -02:00

s5p_fimc.h

[media] s5p-fimc: Convert to use generic media bus polarity flags

2011-09-24 00:22:31 -03:00

saa6588.h

[media] saa6588: rename rds.h to saa6588.h

2010-12-29 08:17:18 -02:00

saa6752hs.h

…

saa7115.h

…

saa7127.h

…

saa7146_vv.h

V4L/DVB: saa7146: fix regression of the av7110/budget-av driver

2010-05-06 19:20:50 -03:00

saa7146.h

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

sh_mobile_ceu.h

[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier

2011-07-27 17:56:08 -03:00

sh_mobile_csi2.h

[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier

2011-07-27 17:56:08 -03:00

sh_vou.h

[media] sh_vou: Don't use module names to load I2C modules

2010-10-22 21:53:33 -02:00

si4713.h

[media] radio-si4713: Add regulator framework support

2010-12-29 08:16:35 -02:00

soc_camera_platform.h

[media] V4L: soc_camera_platform: remove superfluous soc-camera client operations

2011-11-03 18:28:12 -02:00

soc_camera.h

[media] V4L: soc-camera: fix compiler warnings on 64-bit platforms

2011-12-11 09:34:00 -02:00

soc_mediabus.h

[media] V4L: soc-camera: add helper functions for new bus configuration type

2011-11-03 18:27:13 -02:00

sr030pc30.h

[media] Add driver for Siliconfile SR030PC30 VGA camera

2010-10-21 07:55:49 -02:00

timb_radio.h

[media] radio-timb: Simplified platform data

2011-07-27 17:53:07 -03:00

timb_video.h

[media] media: Add timberdale video-in driver

2010-12-29 08:16:46 -02:00

tuner-types.h

…

tuner.h

[media] dib0700: add initial code for PCTV 340e by Davide Ferri

2011-07-27 17:52:25 -03:00

tvaudio.h

V4L/DVB (11376): tvaudio.h: add static inline to retrieve the list of possible i2c addrs.

2009-04-06 21:44:25 -03:00

tveeprom.h

…

tvp514x.h

V4L/DVB (12246): tvp514x: Migration to sub-device framework

2009-09-19 00:18:09 -03:00

tvp5150.h

…

tvp7002.h

V4L/DVB: Definitions for TVP7002 in DM365

2010-02-26 15:11:01 -03:00

tw9910.h

tw9910: use TABs for indentation

2010-02-26 15:10:59 -03:00

upd64031a.h

…

upd64083.h

…

v4l2-chip-ident.h

[media] noon010pc30: Remove g_chip_ident operation handler

2011-09-21 14:31:34 -03:00

v4l2-common.h

[media] v4l2_prio: move from v4l2-common to v4l2-dev

2011-03-22 16:37:54 -03:00

v4l2-ctrls.h

[media] v4l2-ctrls: implement new volatile autocluster scheme

2011-09-21 10:48:30 -03:00

v4l2-dev.h

[media] v4l: Fix media_entity_to_video_device macro argument name

2011-06-01 09:42:03 -03:00

v4l2-device.h

[media] v4l2-device: fix a macro definition

2011-04-13 09:53:29 -03:00

v4l2-event.h

[media] v4l2-event.h: add overview documentation to the header

2011-07-27 17:53:34 -03:00

v4l2-fh.h

[media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh

2011-07-27 17:53:31 -03:00

v4l2-int-device.h

include: replace linux/module.h with "struct module" wherever possible

2011-10-31 19:32:32 -04:00

v4l2-ioctl.h

[media] V4L: add two new ioctl()s for multi-size videobuffer management

2011-11-03 18:28:24 -02:00

v4l2-mediabus.h

[media] v4l2: Add polarity flag definitions for the parallel bus FIELD signal

2011-09-24 00:21:31 -03:00

v4l2-mem2mem.h

[media] Update Pawel Osciak's e-mail address

2011-03-22 04:55:05 -03:00

v4l2-subdev.h

[media] V4L: add .g_std() core V4L2 subdevice operation

2011-11-03 18:29:02 -02:00

videobuf2-core.h

[media] vb2: add vb2_get_unmapped_area in vb2 core

2011-11-03 18:29:13 -02:00

videobuf2-dma-contig.h

[media] media: vb2: dma contig allocator: use dma_addr instread of paddr

2011-09-06 15:05:10 -03:00

videobuf2-dma-sg.h

[media] v4l: videobuf2: add DMA scatter/gather allocator

2011-03-21 20:31:34 -03:00

videobuf2-memops.h

[media] Update Pawel Osciak's e-mail address

2011-03-22 04:55:05 -03:00

videobuf2-vmalloc.h

[media] Update Pawel Osciak's e-mail address

2011-03-22 04:55:05 -03:00

videobuf-core.h

[media] V4L: remove V4L1 compatibility mode

2010-12-29 08:17:07 -02:00

videobuf-dma-contig.h

V4L/DVB: videobuf: add ext_lock argument to the queue init functions

2010-10-21 01:06:14 -02:00

videobuf-dma-sg.h

doc: fix broken references

2011-09-27 18:08:04 +02:00

videobuf-dvb.h

[media] Add missing include guard to header file

2011-05-25 21:42:30 -03:00

videobuf-vmalloc.h

V4L/DVB: videobuf: add ext_lock argument to the queue init functions

2010-10-21 01:06:14 -02:00

wm8775.h

[media] Add proper audio support for Nova-S Plus with wm8775 ADC

2011-03-21 20:32:19 -03:00