Arnd Bergmann 034ee29912 Merge branch 'depends/omap2_dss' into next/cleanup ...

Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.

Conflicts:
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-rx51.c

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

2011-10-31 23:17:39 +01:00

..

acpi

Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-08-03 21:53:27 -10:00

asm-generic

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

crypto

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

drm

drm: Separate EDID Header Check from EDID Block Check

2011-08-04 14:39:35 +01:00

keys

encrypted-keys: add key format support

2011-06-27 09:10:45 -04:00

linux

Merge branch 'tegra/cleanup' into next/cleanup

2011-10-20 14:59:19 +02:00

math-emu

…

media

[media] V4L: initial driver for ov5642 CMOS sensor

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

mtd

…

net

tcp: fix build error if !CONFIG_SYN_COOKIES

2011-09-18 21:48:01 -04:00

pcmcia

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2011-07-31 06:23:08 -10:00

rdma

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

2011-08-06 22:56:03 -07:00

sound

ASoC: omap: Update e-mail address of Jarkko Nikula

2011-08-12 11:45:10 +09:00

target

target: Make standard INQUIRY return 'not connected' for tpg_virt_lun0

2011-08-22 19:25:35 +00:00

trace

writeback: show raw dirtied_when in trace writeback_single_inode

2011-08-31 08:48:15 +08:00

video

OMAPDSS: DISPC: zorder support for DSS overlays

2011-10-03 16:51:55 +03:00

xen

xen/balloon: memory hotplug support for Xen balloon driver

2011-07-25 20:57:08 -07:00

Kbuild

…