Olof Johansson 0f9cb211ba Merge tag 'v3.7-rc7' into next/cleanup ...

Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/plat-omap/i2c.c
	drivers/video/omap2/dss/dss.c

Signed-off-by: Olof Johansson <olof@lixom.net>

2012-11-25 21:34:34 -08:00

2.7 KiB

Raw Blame History

View Raw